mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-24 14:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libltdl/libltdl/lt__glibc.h: Use !HAVE_WORKING_ARGZ

Browse Source 
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>.
This commit is contained in:
Charles Wilson 2007-04-26 22:24:16 +00:00 committed by Ralf Wildenhues
parent 177eb59756
commit 6c611e4510
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2007-04-25 Charles Wilson <libtool@cwilson.fastmail.fm>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

2
libltdl/libltdl/lt__glibc.h
View File

@ -37,7 +37,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
# include <config.h> # include <config.h>
#endif #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 /* Redefine any glibc symbols we reimplement to import the
implementations into our lt__ namespace so we don't ever implementations into our lt__ namespace so we don't ever
clash with the system library if our clients use argz_* clash with the system library if our clients use argz_*

31
libltdl/m4/argz.m4
View File

@ -41,34 +41,35 @@ AS_IF([test -z "$ARGZ_H"],
[AC_CACHE_CHECK( [AC_CACHE_CHECK(
[if argz actually works], [if argz actually works],
[lt_cv_sys_argz_works], [lt_cv_sys_argz_works],
[case $host_os in #( [[case $host_os in #(
*cygwin*) *cygwin*)
lt_cv_sys_argz_works=no lt_cv_sys_argz_works=no
if test "$cross_compiling" != no; then if test "$cross_compiling" != no; then
lt_cv_sys_argz_works="guessing no" lt_cv_sys_argz_works="guessing no"
else else
lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
save_IFS=$IFS save_IFS=$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 IFS=$save_IFS
lt_os_major=$[]{2-0} lt_os_major=${2-0}
lt_os_minor=$[]{3-0} lt_os_minor=${3-0}
lt_os_micro=$[]{4-0} lt_os_micro=${4-0}
if test "$lt_os_major" -gt 1 || if test "$lt_os_major" -gt 1 \
{ test "$lt_os_major" -eq 1 && || { test "$lt_os_major" -eq 1 \
{ test "$lt_os_minor" -gt 5 || && { test "$lt_os_minor" -gt 5 \
{ test "$lt_os_minor" -eq 5 && || { test "$lt_os_minor" -eq 5 \
test "$lt_os_micro" -gt 24; }; }; }; then && test "$lt_os_micro" -gt 24; }; }; }; then
lt_cv_sys_argz_works=yes lt_cv_sys_argz_works=yes
fi fi
fi fi
;; #( ;; #(
*) lt_cv_sys_argz_works=yes ;; *) lt_cv_sys_argz_works=yes ;;
esac]) esac]])
AS_IF([test $lt_cv_sys_argz_works != yes], AS_IF([test $lt_cv_sys_argz_works = yes],
[AC_DEFINE([SYSTEM_ARGZ_IS_BROKEN], 1, [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
[This value is set to 1 to indicate that the system argz facility does not work]) [This value is set to 1 to indicate that the system argz facility works])],
ARGZ_H=argz.h [ARGZ_H=argz.h
AC_LIBOBJ([argz])])]) AC_LIBOBJ([argz])])])
AC_SUBST([ARGZ_H]) AC_SUBST([ARGZ_H])