[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] libtool on cygwin [3/4]: libtool doesn't exist at configurat
From: |
Charles Wilson |
Subject: |
Re: [PATCH] libtool on cygwin [3/4]: libtool doesn't exist at configuration time |
Date: |
Thu, 06 Nov 2003 02:16:21 -0500 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 |
Gary V. Vaughan wrote:
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.
Eek! That suggests to me that the autoquoting in AC_LIBTOOL_CONFIG is
broken :-( I had a suspicion that the variables passed in arg3 of
AC_CONFIG_COMMANDS should be quote escaped.
Rejecting this part of your patch. It would be more general to pass
each of the variables that go through config.status (and are
single-quote delimited) through something like:
postinstall_cmds='`echo "X$postinstall_cmds" | $Xsed "s,','\\\\\\''"`'
in arg3 to AC_CONFIG_COMMANDS.
Does that work for you?
Here's a replacement for this patch (includes the configure.ac changes
again). I *think* this is what you meant; it's hard to tell where
"arg3" begins and ends...
Anyway, the following works. I didn't try to quote-escape any of the
other variables; that's "too big" a decision for me. I just fixed what
was obviously broken on my platform.
--
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 6 Nov 2003 07:05:28 -0000
@@ -4243,8 +4243,8 @@
RANLIB='$RANLIB'
old_postinstall_cmds='$old_postinstall_cmds'
old_postuninstall_cmds='$old_postuninstall_cmds'
- postinstall_cmds='$postinstall_cmds'
- postuninstall_cmds='$postuninstall_cmds'
+ postinstall_cmds='`echo "X$postinstall_cmds" | $Xsed -e "s,','\\\\\\'',g"`'
+ postuninstall_cmds='`echo "X$postuninstall_cmds" | $Xsed -e
"s,','\\\\\\'',g"`'
striplib='$striplib'
old_striplib='$old_striplib'
deplibs_check_method='$deplibs_check_method'
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])