Re: mdemo ltdl failure

[Charles Wilson]

Charles Wilson wrote:
> I'll generate and
> test an additional patch addressing Bruno's concerns.

Attached.  Re-ran *all* of the tests described here:
http://lists.gnu.org/archive/html/libtool-patches/2007-04/msg00073.html
with identical results.

I did not bump the argz.m4 serial again (I'm not sure what the rules 
are: bump on EVERY change, or only on "big" changes?).  So, Ralf, please 
do that manually if it is necessary.

--
Chuck

2007-04-26  Charles Wilson  <address@hidden>

        * libltdl/libltdl/lt__glibc.h: use !HAVE_WORKING_ARGZ
        instead of SYSTEM_ARGZ_IS_BROKEN
        * libltdl/m4/argz.m4 (gl_FUNC_ARGZ): ditto.  Also, minor
        stylistic improvements
        Reported by: Bruno Haible <address@hidden>

Index: libltdl/libltdl/lt__glibc.h
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/libltdl/lt__glibc.h,v
retrieving revision 1.9
diff -u -r1.9 lt__glibc.h
--- libltdl/libltdl/lt__glibc.h 25 Apr 2007 21:17:59 -0000      1.9
+++ libltdl/libltdl/lt__glibc.h 26 Apr 2007 00:33:34 -0000
@@ -37,7 +37,7 @@
 #  include <config.h>
 #endif
 
-#if !defined(HAVE_ARGZ_H) || defined(SYSTEM_ARGZ_IS_BROKEN)
+#if !defined(HAVE_ARGZ_H) || !defined(HAVE_WORKING_ARGZ)
 /* Redefine any glibc symbols we reimplement to import the
    implementations into our lt__ namespace so we don't ever
    clash with the system library if our clients use argz_*
Index: libltdl/m4/argz.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/argz.m4,v
retrieving revision 1.5
diff -u -r1.5 argz.m4
--- libltdl/m4/argz.m4  25 Apr 2007 21:17:59 -0000      1.5
+++ libltdl/m4/argz.m4  26 Apr 2007 00:33:34 -0000
@@ -41,34 +41,35 @@
     [AC_CACHE_CHECK(
         [if argz actually works],
         [lt_cv_sys_argz_works],
-        [case $host_os in #(
+        [[case $host_os in #(
         *cygwin*)
           lt_cv_sys_argz_works=no
           if test "$cross_compiling" != no; then
             lt_cv_sys_argz_works="guessing no"
           else
+            lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
             save_IFS=$IFS
             IFS=-.
-            set x `uname -r | $SED -e 's/^\([[0-9\.]]*\).*/\1/'`
+            set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
             IFS=$save_IFS
-            lt_os_major=$[]{2-0}
-            lt_os_minor=$[]{3-0}
-            lt_os_micro=$[]{4-0}
-            if test "$lt_os_major" -gt 1 ||
-               { test "$lt_os_major" -eq 1 &&
-                 { test "$lt_os_minor" -gt 5 ||
-                   { test "$lt_os_minor" -eq 5 &&
-                     test "$lt_os_micro" -gt 24; }; }; }; then
+            lt_os_major=${2-0}
+            lt_os_minor=${3-0}
+            lt_os_micro=${4-0}
+            if test "$lt_os_major" -gt 1 \
+               || { test "$lt_os_major" -eq 1 \
+                 && { test "$lt_os_minor" -gt 5 \
+                   || { test "$lt_os_minor" -eq 5 \
+                     && test "$lt_os_micro" -gt 24; }; }; }; then
               lt_cv_sys_argz_works=yes
             fi
           fi
           ;; #(
         *) lt_cv_sys_argz_works=yes ;;
-        esac])
-     AS_IF([test $lt_cv_sys_argz_works != yes],
-        [AC_DEFINE([SYSTEM_ARGZ_IS_BROKEN], 1,
-                   [This value is set to 1 to indicate that the system argz 
facility does not work])
-        ARGZ_H=argz.h
+        esac]])
+     AS_IF([test $lt_cv_sys_argz_works = yes],
+        [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
+                   [This value is set to 1 to indicate that the system argz 
facility works])],
+        [ARGZ_H=argz.h
         AC_LIBOBJ([argz])])])
 
 AC_SUBST([ARGZ_H])