From: Charles Wilson <cwilson@ece.gatech.edu>
Date: Thu, 6 Nov 2003 14:42:46 +0000 (+0000)
Subject: * tests/depdemo/configure.ac, tests/mdemo/configure.ac,
X-Git-Tag: release-1-9b~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24ed9eea92f69015f396468132ac803ef084054b;p=thirdparty%2Flibtool.git

* 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 667d8f2ce..7e6f9edba 100644
--- 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 09d4d5bb0..b1377e3f8 100644
--- 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 1c474fba6..3b6891ef7 100644
--- 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 3351eae69..c194dddc8 100644
--- 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])