From: Bruno Haible Date: Tue, 19 Nov 2002 12:51:37 +0000 (+0000) Subject: Switch to autoconf-2.56. X-Git-Tag: v0.12~1208 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6594ef73d5ccd4b6d427143f94f412af9d5fb17;p=thirdparty%2Fgettext.git Switch to autoconf-2.56. --- diff --git a/ChangeLog b/ChangeLog index 5479a276e..102b40131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-11-19 Bruno Haible + + Switch to autoconf-2.56. + * configure.in (LTLIBOBJS): Remove variable. + 2002-11-14 Bruno Haible * Makefile.am ($(srcdir)/tests/rpathx/aclocal.m4, diff --git a/configure.in b/configure.in index 249dacbcc..209f993b4 100644 --- a/configure.in +++ b/configure.in @@ -254,10 +254,6 @@ EOF dnl These ought to go away some day. changequote(,)dnl -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` -changequote([, ])dnl -AC_SUBST(LTLIBOBJS) -changequote(,)dnl LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` changequote([, ])dnl AC_SUBST(LTALLOCA) diff --git a/m4/ChangeLog b/m4/ChangeLog index 71a9a59b6..a808e0e37 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,13 @@ +2002-11-19 Bruno Haible + + Switch to autoconf-2.56. + * fnmatch.m4 (gt_FUNC_FNMATCH): Use AC_LIBOBJ instead of assigning + LIBOBJS. + * getline.m4 (AM_FUNC_GETLINE): Likewise. + + * lib-ld.m4 (AC_LIB_PROG_LD_GNU): Define PATH_SEPARATOR before using + it. + 2002-11-13 Bruno Haible Assume ANSI C. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 1266cb1da..b1f60486f 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,4 +1,4 @@ -# fnmatch.m4 serial 2 (gettext-0.11.1) +# fnmatch.m4 serial 3 (gettext-0.11.6) dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -6,6 +6,8 @@ dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. +AC_PREREQ(2.52) + dnl Determine whether the system has a working fnmatch() function. AC_DEFUN([gt_FUNC_FNMATCH], [ @@ -44,7 +46,6 @@ AC_DEFUN([gt_FUNC_FNMATCH], dnl libgettextlib.so. AC_DEFINE([fnmatch], [posix_fnmatch], [Define to a replacement function name for fnmatch().]) - LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}" - AC_SUBST(LIBOBJS) + AC_LIBOBJ(pfnmatch) fi ]) diff --git a/m4/getline.m4 b/m4/getline.m4 index ad2956709..9919a7c07 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,4 +1,4 @@ -# getline.m4 serial 5 (gettext-0.11) +# getline.m4 serial 6 (gettext-0.11.6) dnl Copyright (C) 1998-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -6,6 +6,8 @@ dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. +AC_PREREQ(2.52) + dnl See if there's a working, system-supplied version of the getline function. dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems dnl have a function by that name in -linet that doesn't have anything @@ -47,7 +49,6 @@ AC_DEFUN([AM_FUNC_GETLINE], dnl libgettextlib.so. AC_DEFINE([getline], [gnu_getline], [Define to a replacement function name for getline().]) - LIBOBJS="$LIBOBJS getline.${ac_objext}" - AC_SUBST(LIBOBJS) + AC_LIBOBJ(getline) fi ]) diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index ddb573234..ec07c0cc6 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -29,6 +29,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path.