--- aclocal.m4 2001/09/13 13:57:38 1.4
+++ aclocal.m4 2002/03/14 15:49:51 1.5
@@ -31,7 +31,6 @@
dnl ##
AC_DEFUN(AC_HEADLINE,[dnl
-AC_DIVERT_PUSH(NOTICE)dnl
# configuration header
if test ".`echo dummy [$]@ | grep help`" = .; then
# bootstrapping shtool
@@ -60,7 +59,6 @@
$3_HEX="`$ac_shtool version -l c -d hex $ac_srcdir/$4`"
AC_SUBST($3_HEX)
fi
-AC_DIVERT_POP()
])dnl
dnl ##
@@ -125,7 +123,7 @@
esac
fi
msg="enabled"
-AC_DEFINE(STR_DEBUG)
+AC_DEFINE(STR_DEBUG, 1, [Define to 1 if you want to enable debugging])
],[
if test ".$ac_cv_prog_gcc" = ".yes"; then
case "$CFLAGS" in
@@ -189,7 +187,6 @@
fi
])
-
dnl ##
dnl ## Check for an external/extension library.
dnl ## - is aware of <libname>-config style scripts
@@ -208,10 +205,10 @@
dnl ##
AC_DEFUN(AC_CHECK_EXTLIB,[dnl
-AC_ARG_WITH($2,dnl
-[ --with-]substr([$2[[=DIR]] ], 0, 19)[build against $1 library (default=no)],
+AC_ARG_WITH($2, [dnl
+[ --with-]m4_substr([$2[[=DIR]] ], 0, 19)[build with external $1 library (default=no)]], [dnl
if test ".$with_$2" = .yes; then
- # via config script
+ # via config script in PATH
$2_version=`($2-config --version) 2>/dev/null`
if test ".$$2_version" != .; then
CPPFLAGS="$CPPFLAGS `$2-config --cflags`"
@@ -223,7 +220,7 @@
found=0
# via config script
for dir in $with_$2/bin $with_$2; do
- if test -f "$dir/$2-config"; then
+ if test -f "$dir/$2-config" && test ! -f "$dir/$2-config.in"; then
$2_version=`($dir/$2-config --version) 2>/dev/null`
if test ".$$2_version" != .; then
CPPFLAGS="$CPPFLAGS `$dir/$2-config --cflags`"
@@ -234,7 +231,7 @@
fi
fi
done
- # via standard paths
+ # in standard sub-areas
if test ".$found" = .0; then
for dir in $with_$2/include/$2 $with_$2/include $with_$2; do
if test -f "$dir/$4"; then
@@ -245,25 +242,29 @@
fi
done
for dir in $with_$2/lib/$2 $with_$2/lib $with_$2; do
- if test -f "$dir/lib$2.a" -o -f "$dir/lib$2.so"; then
+ if test -f "$dir/lib$2.la" && test -d "$dir/.libs"; then
+ LDFLAGS="$LDFLAGS -L$dir -L$dir/.libs"
+ found=1
+ break
+ elif test -f "$dir/lib$2.a" || test -f "$dir/lib$2.so"; then
LDFLAGS="$LDFLAGS -L$dir"
found=1
break
fi
done
fi
- # in any subarea
+ # in any sub-area
if test ".$found" = .0; then
changequote(, )dnl
for file in x `find $with_$2 -name "$4" -type f -print`; do
test .$file = .x && continue
- dir=`echo $file | sed -e 's;[[^/]]*$;;' -e 's;\(.\)/$;\1;'`
+ dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
CPPFLAGS="$CPPFLAGS -I$dir"
CFLAGS="$CFLAGS -I$dir"
done
- for file in x `find $with_$2 -name "lib$2.[[aso]]" -type f -print`; do
+ for file in x `find $with_$2 -name "lib$2.[aso]" -type f -print`; do
test .$file = .x && continue
- dir=`echo $file | sed -e 's;[[^/]]*$;;' -e 's;\(.\)/$;\1;'`
+ dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
LDFLAGS="$LDFLAGS -L$dir"
done
changequote([, ])dnl
@@ -272,16 +273,24 @@
fi
AC_HAVE_HEADERS($4)
AC_CHECK_LIB($2, $3)
- AC_IFALLYES(header:$4 lib:$2_$3, with_$2=yes, with_$2=no)
+ with_$2=yes
+ ac_var="ac_cv_header_`echo $4 | sed 'y%./+-%__p_%'`"
+ eval "ac_val=\$$ac_var"
+ if test ".$ac_val" != .yes; then
+ with_$2=no
+ fi
+ if test ".$ac_cv_lib_$2_$3" != .yes; then
+ with_$2=no
+ fi
if test ".$with_$2" = .no; then
AC_ERROR([Unable to find $1 library])
fi
-,
+ ], [dnl
if test ".$with_$2" = .; then
with_$2=no
fi
-)dnl
-AC_MSG_CHECKING(whether to build against $1 library)
+ ])dnl
+AC_MSG_CHECKING(whether to build against external $1 library)
if test ".$with_$2" = .yes; then
ifelse([$5], , :, [$5])
else
@@ -289,4 +298,3 @@
fi
AC_MSG_RESULT([$with_$2])
])dnl
-
|
