* tests/depdemo/configure.ac, tests/mdemo/configure.ac,

tests/mdemo2/configure.ac: process 'libtool --features'
from Makefile, not configure -- because libtool doesn't
exist at configure time.

diff --git a/ChangeLog b/ChangeLog
index 667d8f2ce173677c0c6539adb08084defaa8c1b1..7e6f9edbaf5358a44db6a60f8888d7bbffe00cd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-11-06  Charles Wilson  <cwilson@ece.gatech.edu>
 
+       * tests/depdemo/configure.ac, tests/mdemo/configure.ac,
+       tests/mdemo2/configure.ac: process 'libtool --features'
+       from Makefile, not configure -- because libtool doesn't
+       exist at configure time.
+
        * ltmain.in (find_executable, check_executable) [cygwin*, mingw*]:
        binary wrapper used with uninstalled executables breaks when
        invoked via execlp/execvp (that is, via $PATH).  Handle that case.

diff --git a/tests/depdemo/configure.ac b/tests/depdemo/configure.ac
index 09d4d5bb091880c3e81dbe8c526aeb743cac795b..b1377e3f839aa07358b3e848d7a494b431c9ce03 100644 (file)
--- a/tests/depdemo/configure.ac
+++ b/tests/depdemo/configure.ac
@@ -49,11 +49,7 @@ AC_SUBST([LIBTOOL_DEPS])
 ## ------------------------------- ##
 ## depdemo specific configuration. ##
 ## ------------------------------- ##
-if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
-  STATIC=-static
-else
-  STATIC=
-fi
+STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
 AC_SUBST([STATIC])
 
 ## ---------------------------- ##

diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac
index 1c474fba6f4942a52cf10aa246c6fc3386071235..3b6891ef78910a8579e112ae9d6092ad2b45cc73 100644 (file)
--- a/tests/mdemo/configure.ac
+++ b/tests/mdemo/configure.ac
@@ -52,11 +52,7 @@ AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
-if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
-  STATIC=-static
-else
-  STATIC=
-fi
+STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
 AC_SUBST([STATIC])
 
 

diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac
index 3351eae69dcd61941966827e6f20b448decaf98f..c194dddc8a8fa8b7f52bacf7df7d996b2c699787 100644 (file)
--- a/tests/mdemo2/configure.ac
+++ b/tests/mdemo2/configure.ac
@@ -47,11 +47,7 @@ AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
-if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
-  STATIC=-static
-else
-  STATIC=
-fi
+STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
 AC_SUBST([STATIC])