Commit 18262984 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

m4/oln-with-lib.m4: Force headers lookup in specified path.

parent 6e783da9
2010-08-24 Guillaume Lazzara <z@lrde.epita.fr>
* m4/oln-with-lib.m4: Force headers lookup in specified path.
2010-08-13 Guillaume Lazzara <z@lrde.epita.fr> 2010-08-13 Guillaume Lazzara <z@lrde.epita.fr>
* configure.ac: Handle ImageMagick++ dependency with both * configure.ac: Handle ImageMagick++ dependency with both
......
...@@ -74,17 +74,20 @@ AC_DEFUN([_OLN_WITH_LIB], ...@@ -74,17 +74,20 @@ AC_DEFUN([_OLN_WITH_LIB],
[use $1 (DIR = prefix for $1 installation)])]) [use $1 (DIR = prefix for $1 installation)])])
$5_CPPFLAGS='' $5_CPPFLAGS=''
$5_LDFLAGS='' $5_LDFLAGS=''
base_inc_dir=''
oln_have_$4=no oln_have_$4=no
if test "x$with_$4" != xno; then if test "x$with_$4" != xno; then
if test -n "$with_$4"; then if test -n "$with_$4"; then
$5_CPPFLAGS="-I${with_$4}/include" base_inc_dir="${with_$4}/include/"
$5_CPPFLAGS="-I${base_inc_dir}"
$5_LDFLAGS="-L${with_$4}/lib" $5_LDFLAGS="-L${with_$4}/lib"
fi fi
oln_save_CPPFLAGS=$CPPFLAGS oln_save_CPPFLAGS=$CPPFLAGS
oln_save_LDFLAGS=$LDFLAGS oln_save_LDFLAGS=$LDFLAGS
CPPFLAGS="$CPPFLAGS $$5_CPPFLAGS" CPPFLAGS="$CPPFLAGS $$5_CPPFLAGS"
LDFLAGS="$LDFLAGS $$5_LDFLAGS" LDFLAGS="$LDFLAGS $$5_LDFLAGS"
AC_CHECK_HEADER([$2], header="${base_inc_dir}$2"
AC_CHECK_HEADER([$header],
[AC_CHECK_LIB([$3], [AC_CHECK_LIB([$3],
[main], [main],
[oln_have_$4=yes [oln_have_$4=yes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment