[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] libtool on cygwin [3/4]: libtool doesn't exist at configuration
From: |
Charles Wilson |
Subject: |
[PATCH] libtool on cygwin [3/4]: libtool doesn't exist at configuration time |
Date: |
Wed, 05 Nov 2003 05:18:13 -0500 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 |
Because postinstall_cmd and postuninstall_cmd are now stored in
config.status before being used to generate libtool via AC_OUTPUT(), the
cygwin versions of those variables need extra quote protection.
Also, the configure.ac of some of the tests assume that libtool exists
at configuration time. Instead, delay `libtool --features` until Makefile.
--
Chuck
2003-07-12 Charles Wilson <address@hidden>
* m4/libtool.m4: protect quotes in cygwin's
$postinstall_cmds and $postuninstall_cmds, which were
broken by gvv change of 2003-10-21.
* tests/depdemo/configure.ac: process 'libtool --features'
from Makefile, not configure -- because libtool doesn't
exist at configuretime.
* tests/mdemo/configure.ac: process 'libtool --features'
from Makefile, not configure -- because libtool doesn't
exist at configuretime.
* tests/mdemo2/configure.ac: process 'libtool --features'
from Makefile, not configure -- because libtool doesn't
exist at configuretime.
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.9
diff -u -r1.9 libtool.m4
--- m4/libtool.m4 30 Oct 2003 14:28:00 -0000 1.9
+++ m4/libtool.m4 3 Nov 2003 16:35:13 -0000
@@ -1247,11 +1247,11 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo
\$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\'\\\'\''.
$dir/'\'\\\'\''\${base_file}'\'\\\'\''i;echo \$dlname'\'\\\'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\'\\\'\''. $file; echo
\$dlname'\'\\\'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
shlibpath_overrides_runpath=yes
Index: tests/depdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- tests/depdemo/configure.ac 21 Oct 2003 10:56:23 -0000 1.2
+++ tests/depdemo/configure.ac 3 Nov 2003 16:35:14 -0000
@@ -49,11 +49,7 @@
## ------------------------------- ##
## 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])
## ---------------------------- ##
Index: tests/mdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- tests/mdemo/configure.ac 21 Oct 2003 10:56:24 -0000 1.2
+++ tests/mdemo/configure.ac 3 Nov 2003 16:35:14 -0000
@@ -52,11 +52,7 @@
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])
Index: tests/mdemo2/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- tests/mdemo2/configure.ac 21 Oct 2003 10:56:24 -0000 1.2
+++ tests/mdemo2/configure.ac 3 Nov 2003 16:35:14 -0000
@@ -47,11 +47,7 @@
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])
- [PATCH] libtool on cygwin [3/4]: libtool doesn't exist at configuration time,
Charles Wilson <=