diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.in | 2 | ||||
| -rw-r--r-- | m4/fpending.m4 | 4 | ||||
| -rw-r--r-- | m4/gettext.m4 | 6 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 2 | ||||
| -rw-r--r-- | m4/regex.m4 | 27 | ||||
| -rw-r--r-- | m4/stdbool.m4 | 11 |
6 files changed, 42 insertions, 10 deletions
diff --git a/m4/Makefile.in b/m4/Makefile.in index f32f71a..9dc5350 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -116,6 +116,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 87398b1..f43aaa4 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 # Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_FPENDING], 'fp->_p - fp->_bf._base' \ \ '# SCO, Unixware' \ - 'fp->__ptr - fp->__base' \ + '(fp->__ptr ? fp->__ptr - fp->__base : 0)' \ \ '# old glibc?' \ 'fp->__bufp - fp->__buffer' \ diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 624a807..da2d610 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -234,9 +234,11 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + INTLDIR="ifelse([$3],[],\${top_builddir}/intl,[$3])" + LIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + CPPFLAGS="$CPPFLAGS -I${INTLDIR}" fi CATOBJEXT= diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 96b0f7c..daff40e 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -26,6 +26,7 @@ AC_DEFUN([gl_EARLY], # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ +AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) gl_FUNC_ALLOCA gl_FUNC_ATEXIT gl_CLOSEOUT @@ -144,6 +145,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strstr.c lib/strstr.h lib/umaxtostr.c + lib/verify.h lib/xalloc-die.c lib/xalloc.h lib/xgetcwd.c diff --git a/m4/regex.m4 b/m4/regex.m4 index d7e2210..8ea4fe9 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 30 +#serial 31 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free # Software Foundation, Inc. @@ -15,8 +15,29 @@ AC_PREREQ([2.50]) AC_DEFUN([gl_REGEX], [ AC_REQUIRE([AC_SYS_LARGEFILE]) dnl for a sufficently-wide off_t - AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, - [Define if you want regoff_t to be at least as wide POSIX requires.]) + + AC_CACHE_CHECK([whether off_t can be used in a switch statement], + [gl_cv_type_off_t_switch], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[off_t o = -1; + switch (o) + { + case -2: + return 1; + case -1: + return 2; + default: + return 0; + } + ]])], + [gl_cv_type_off_t_switch=yes], + [gl_cv_type_off_t_switch=no])]) + if test $gl_cv_type_off_t_switch = yes; then + AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, + [Define if you want regoff_t to be at least as wide POSIX requires.]) + fi AC_LIBSOURCES( [regcomp.c, regex.c, regex.h, diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 3f6b4bf..dcb5793 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,6 +28,9 @@ AC_DEFUN([AM_STDBOOL_H], AC_SUBST([HAVE__BOOL]) ]) +# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) + # This macro is only needed in autoconf <= 2.59. Newer versions of autoconf # have this macro built-in. @@ -70,10 +73,12 @@ AC_DEFUN([AC_HEADER_STDBOOL], enum { j = false, k = true, l = false * true, m = true * 256 }; _Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ], [ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l - + !m + !n + !o); + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p); ], [ac_cv_header_stdbool_h=yes], [ac_cv_header_stdbool_h=no])]) |