From 24ed9eea92f69015f396468132ac803ef084054b Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Thu, 6 Nov 2003 14:42:46 +0000 Subject: [PATCH] * 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. --- ChangeLog | 5 +++++ tests/depdemo/configure.ac | 6 +----- tests/mdemo/configure.ac | 6 +----- tests/mdemo2/configure.ac | 6 +----- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 667d8f2c..7e6f9edb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-11-06 Charles Wilson + * 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 09d4d5bb..b1377e3f 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 1c474fba..3b6891ef 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 3351eae6..c194dddc 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])