[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Fix LT_WITH_LTDL: AU_ALIAS bug
From: |
Ralf Wildenhues |
Subject: |
Re: Fix LT_WITH_LTDL: AU_ALIAS bug |
Date: |
Fri, 9 Sep 2005 15:31:45 +0200 |
User-agent: |
Mutt/1.4.1i |
* Ralf Wildenhues wrote on Fri, Sep 09, 2005 at 02:09:01PM CEST:
> Hunting down bugs in m4 macros sucks. Using $# in macros sucks, too.
> Sorry for the cross-post.
More instances of this bug. Silent bitrot of old code, enabled by a
seemingly unrelated "renaming cleanup"..
OK to apply?
Cheers,
Ralf
* libltdl/m4/ltdl.m4 (LTDL_INIT): Work around AU_ALIAS bug.
* libltdl/m4/ltoptions.m4 (_LT_WITH_PIC): Likewise.
Index: libltdl/m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltdl.m4,v
retrieving revision 1.6
diff -u -r1.6 ltdl.m4
--- libltdl/m4/ltdl.m4 29 Aug 2005 10:47:41 -0000 1.6
+++ libltdl/m4/ltdl.m4 9 Sep 2005 13:24:58 -0000
@@ -141,7 +141,7 @@
# Perform all the checks necessary for compilation of the ltdl objects
# -- including compiler checks and header checks.
AC_DEFUN([LTDL_INIT],
-[m4_if([$#], 1, [m4_divert_push([DEFAULTS])dnl
+[m4_ifval([$1], [m4_divert_push([DEFAULTS])dnl
# libltdl will be built in the named DIRECTORY, relative to $top_builddir.
lt_ltdl_dir='$1'
m4_divert_pop([DEFAULTS])])dnl
Index: libltdl/m4/ltoptions.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltoptions.m4,v
retrieving revision 1.4
diff -u -r1.4 ltoptions.m4
--- libltdl/m4/ltoptions.m4 1 Sep 2005 11:41:26 -0000 1.4
+++ libltdl/m4/ltoptions.m4 9 Sep 2005 13:24:58 -0000
@@ -360,7 +360,7 @@
[pic_mode="$withval"],
[pic_mode=default])
-test -z "$pic_mode" && pic_mode=m4_if($#, 1, $1, default)
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC