* 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.
Report by Bruno Haible <bruno@clisp.org>.

diff --git a/ChangeLog b/ChangeLog
index 8abce9c28ec1ecfa4875793bfb6773a74d048d33..aa72f63b2f104f056b402641ba47ecde6e737a65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-27  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+       * 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.
+       Report by Bruno Haible <bruno@clisp.org>.
+
 2007-04-25  Charles Wilson  <libtool@cwilson.fastmail.fm>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index ffbb089d47106c09666cb9e01c7d1fd03331dd90..f284773d126e4bcfa32971dafafa1a6355412d9a 100644 (file)
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -37,7 +37,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #  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_*

diff --git a/libltdl/m4/argz.m4 b/libltdl/m4/argz.m4
index bb7a6abb4df50e5c2fc7d14d50d3eae572da829e..1f8d67d04a458db8ff30da055bddeaef9edb96e4 100644 (file)
--- a/libltdl/m4/argz.m4
+++ b/libltdl/m4/argz.m4
@@ -41,34 +41,35 @@ AS_IF([test -z "$ARGZ_H"],
     [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])