Author: erijo Date: Tue Aug 15 21:38:24 2006 New Revision: 4568 URL: http://svn.licq.org/viewvc/licq?rev=3D4568&view=3Drev Log: Updated from gettext 0.14.6. Modified: trunk/licq/m4/codeset.m4 trunk/licq/m4/gettext.m4 trunk/licq/m4/glibc21.m4 trunk/licq/m4/iconv.m4 trunk/licq/m4/intdiv0.m4 trunk/licq/m4/inttypes-pri.m4 trunk/licq/m4/inttypes.m4 trunk/licq/m4/inttypes_h.m4 trunk/licq/m4/isc-posix.m4 trunk/licq/m4/lcmessage.m4 trunk/licq/m4/lib-ld.m4 trunk/licq/m4/lib-link.m4 trunk/licq/m4/lib-prefix.m4 trunk/licq/m4/nls.m4 trunk/licq/m4/po.m4 trunk/licq/m4/progtest.m4 trunk/licq/m4/stdint_h.m4 trunk/licq/m4/uintmax_t.m4 trunk/licq/m4/ulonglong.m4 Modified: trunk/licq/m4/codeset.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/codeset.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/codeset.m4 (original) +++ trunk/licq/m4/codeset.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # codeset.m4 serial AM1 (gettext-0.10.40) dnl Copyright (C) 2000-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 -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. +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. =20 dnl From Bruno Haible. =20 Modified: trunk/licq/m4/gettext.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/gettext.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/gettext.m4 (original) +++ trunk/licq/m4/gettext.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# gettext.m4 serial 20 (gettext-0.12) -dnl Copyright (C) 1995-2003 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 -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. +# gettext.m4 serial 37 (gettext-0.14.4) +dnl Copyright (C) 1995-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. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -65,8 +63,8 @@ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-= formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) =20 AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ @@ -92,6 +90,9 @@ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) =20 + dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + dnl Set USE_NLS. AM_NLS =20 @@ -138,7 +139,7 @@ ], [])[extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext= ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", ""= , 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], gt_cv_func_gnugettext_libc=3Dyes, gt_cv_func_gnugettext_libc=3Dno)]) =20 @@ -172,9 +173,9 @@ #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias ();], +const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext= ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", ""= , 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], gt_cv_func_gnugettext_libintl=3Dyes, gt_cv_func_gnugettext_libintl=3Dno) dnl Now see whether libintl exists and depends on libiconv. @@ -193,9 +194,9 @@ #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias ();], +const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext= ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", ""= , 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL=3D"$LIBINTL $LIBICONV" LTLIBINTL=3D"$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=3Dyes @@ -238,12 +239,22 @@ LIBS=3D`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/= $//'` fi =20 + CATOBJEXT=3D if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ || test "$nls_cv_use_gnu_gettext" =3D "yes"; then dnl Mark actions to use GNU gettext tools. CATOBJEXT=3D.gmo fi ]) + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ + || test "$nls_cv_use_gnu_gettext" =3D "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL=3D"$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL=3D"$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi =20 if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ || test "$nls_cv_use_gnu_gettext" =3D "yes"; then @@ -320,6 +331,7 @@ AC_SUBST(GENCAT) =20 dnl For backward compatibility. Some Makefiles may be using this. + INTLOBJS=3D if test "$USE_INCLUDED_LIBINTL" =3D yes; then INTLOBJS=3D"\$(GETTOBJS)" fi @@ -350,32 +362,90 @@ AC_REQUIRE([AM_MKINSTALLDIRS])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([gt_GLIBC2])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([bh_C_SIGNED])dnl AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl + AC_REQUIRE([gt_TYPE_WINT_T])dnl + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + AC_REQUIRE([gt_TYPE_INTMAX_T]) + AC_REQUIRE([gt_PRINTF_POSIX]) AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gl_GLIBC21])dnl AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl - + AC_REQUIRE([gl_XSIZE])dnl + AC_REQUIRE([gt_INTL_MACOSX])dnl + + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], + [Define as the type of the result of subtracting two pointers, if t= he system doesn't define it.]) + ]) AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegi= d \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_nex= t \ + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ __fsetlocking]) + + dnl Use the _snprintf function only if it is declared (because on NetBSD= it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). + gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) + gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) + + dnl Use the *_unlocked functions only if they are declared. + dnl (because some of them were defined without being declared in Solaris + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built + dnl on Solaris 2.5.1 to run on Solaris 2.6). + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. + gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) + gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) + gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) + + case $gt_cv_func_printf_posix in + *yes) HAVE_POSIX_PRINTF=3D1 ;; + *) HAVE_POSIX_PRINTF=3D0 ;; + esac + AC_SUBST([HAVE_POSIX_PRINTF]) + if test "$ac_cv_func_asprintf" =3D yes; then + HAVE_ASPRINTF=3D1 + else + HAVE_ASPRINTF=3D0 + fi + AC_SUBST([HAVE_ASPRINTF]) + if test "$ac_cv_func_snprintf" =3D yes; then + HAVE_SNPRINTF=3D1 + else + HAVE_SNPRINTF=3D0 + fi + AC_SUBST([HAVE_SNPRINTF]) + if test "$ac_cv_func_wprintf" =3D yes; then + HAVE_WPRINTF=3D1 + else + HAVE_WPRINTF=3D0 + fi + AC_SUBST([HAVE_WPRINTF]) =20 AM_ICONV AM_LANGINFO_CODESET if test $ac_cv_header_locale_h =3D yes; then - AM_LC_MESSAGES + gt_LC_MESSAGES + fi + + if test -n "$INTL_MACOSX_LIBS"; then + CPPFLAGS=3D"$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.fram= ework/Headers" fi =20 dnl intl/plural.c is generated from intl/plural.y. It requires bison, @@ -411,5 +481,69 @@ ]) =20 =20 +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + gt_cv_func_CFPreferencesCopyAppValue, + [gt_save_CPPFLAGS=3D"$CPPFLAGS" + CPPFLAGS=3D"$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.fra= mework/Headers" + gt_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include <CFPreferences.h>], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=3Dyes], + [gt_cv_func_CFPreferencesCopyAppValue=3Dno]) + CPPFLAGS=3D"$gt_save_CPPFLAGS" + LIBS=3D"$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue =3D yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppVa= lue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + [gt_save_CPPFLAGS=3D"$CPPFLAGS" + CPPFLAGS=3D"$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.fra= mework/Headers" + gt_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=3Dyes], + [gt_cv_func_CFLocaleCopyCurrent=3Dno]) + CPPFLAGS=3D"$gt_save_CPPFLAGS" + LIBS=3D"$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent =3D yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in= the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS=3D + if test $gt_cv_func_CFPreferencesCopyAppValue =3D yes || test $gt_cv_fun= c_CFLocaleCopyCurrent =3D yes; then + INTL_MACOSX_LIBS=3D"-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + + +dnl gt_CHECK_DECL(FUNC, INCLUDES) +dnl Check whether a function is declared. +AC_DEFUN([gt_CHECK_DECL], +[ + AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, + [AC_TRY_COMPILE([$2], [ +#ifndef $1 + char *p =3D (char *) $1; +#endif +], ac_cv_have_decl_$1=3Dyes, ac_cv_have_decl_$1=3Dno)]) + if test $ac_cv_have_decl_$1 =3D yes; then + gt_value=3D1 + else + gt_value=3D0 + fi + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], + [Define to 1 if you have the declaration of `$1', and to 0 if you don'= t=2E]) +]) + + dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) Modified: trunk/licq/m4/glibc21.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/glibc21.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/glibc21.m4 (original) +++ trunk/licq/m4/glibc21.m4 Tue Aug 15 21:38:24 2006 @@ -1,15 +1,13 @@ -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -dnl Copyright (C) 2000-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 -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. +# glibc21.m4 serial 3 +dnl Copyright (C) 2000-2002, 2004 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. =20 # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. =20 -AC_DEFUN([jm_GLIBC21], +AC_DEFUN([gl_GLIBC21], [ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, ac_cv_gnu_library_2_1, Modified: trunk/licq/m4/iconv.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/iconv.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/iconv.m4 (original) +++ trunk/licq/m4/iconv.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # iconv.m4 serial AM4 (gettext-0.11.3) dnl Copyright (C) 2000-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 -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. +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. =20 dnl From Bruno Haible. =20 Modified: trunk/licq/m4/intdiv0.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/intdiv0.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/intdiv0.m4 (original) +++ trunk/licq/m4/intdiv0.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # intdiv0.m4 serial 1 (gettext-0.11.3) dnl Copyright (C) 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 -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. +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. =20 dnl From Bruno Haible. =20 Modified: trunk/licq/m4/inttypes-pri.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/inttypes-pri.m4?rev=3D45= 68&r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/inttypes-pri.m4 (original) +++ trunk/licq/m4/inttypes-pri.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # inttypes-pri.m4 serial 1 (gettext-0.11.4) dnl Copyright (C) 1997-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 -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. +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. =20 dnl From Bruno Haible. =20 Modified: trunk/licq/m4/inttypes.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/inttypes.m4?rev=3D4568&r= 1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/inttypes.m4 (original) +++ trunk/licq/m4/inttypes.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # inttypes.m4 serial 1 (gettext-0.11.4) dnl Copyright (C) 1997-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 -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. +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. =20 dnl From Paul Eggert. =20 Modified: trunk/licq/m4/inttypes_h.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/inttypes_h.m4?rev=3D4568= &r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/inttypes_h.m4 (original) +++ trunk/licq/m4/inttypes_h.m4 Tue Aug 15 21:38:24 2006 @@ -1,26 +1,24 @@ -# inttypes_h.m4 serial 5 (gettext-0.12) -dnl Copyright (C) 1997-2003 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 -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. +# inttypes_h.m4 serial 6 +dnl Copyright (C) 1997-2004 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. =20 dnl From Paul Eggert. =20 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, # doesn't clash with <sys/types.h>, and declares uintmax_t. =20 -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [ - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, [AC_TRY_COMPILE( [#include <sys/types.h> #include <inttypes.h>], [uintmax_t i =3D (uintmax_t) -1;], - jm_ac_cv_header_inttypes_h=3Dyes, - jm_ac_cv_header_inttypes_h=3Dno)]) - if test $jm_ac_cv_header_inttypes_h =3D yes; then + gl_cv_header_inttypes_h=3Dyes, + gl_cv_header_inttypes_h=3Dno)]) + if test $gl_cv_header_inttypes_h =3D yes; then AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) Modified: trunk/licq/m4/isc-posix.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/isc-posix.m4?rev=3D4568&= r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/isc-posix.m4 (original) +++ trunk/licq/m4/isc-posix.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ # isc-posix.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 1995-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 -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. +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. =20 # This file is not needed with autoconf-2.53 and newer. Remove it in 2005. =20 Modified: trunk/licq/m4/lcmessage.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/lcmessage.m4?rev=3D4568&= r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/lcmessage.m4 (original) +++ trunk/licq/m4/lcmessage.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# lcmessage.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 1995-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 -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. +# lcmessage.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1995-2002, 2004-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. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -20,12 +18,12 @@ =20 # Check whether LC_MESSAGES is available in <locale.h>. =20 -AC_DEFUN([AM_LC_MESSAGES], +AC_DEFUN([gt_LC_MESSAGES], [ - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=3Dyes, am_cv_val_LC_MESSAGES=3Dno)]) - if test $am_cv_val_LC_MESSAGES =3D yes; then + gt_cv_val_LC_MESSAGES=3Dyes, gt_cv_val_LC_MESSAGES=3Dno)]) + if test $gt_cv_val_LC_MESSAGES =3D yes; then AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your <locale.h> file defines LC_MESSAGES.]) fi Modified: trunk/licq/m4/lib-ld.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/lib-ld.m4?rev=3D4568&r1= =3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/lib-ld.m4 (original) +++ trunk/licq/m4/lib-ld.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# lib-ld.m4 serial 2 (gettext-0.12) +# lib-ld.m4 serial 3 (gettext-0.13) dnl Copyright (C) 1996-2003 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 -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. +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. =20 dnl Subroutines of libtool.m4, dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision @@ -14,11 +12,12 @@ AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept= -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - acl_cv_prog_gnu_ld=3Dyes -else - acl_cv_prog_gnu_ld=3Dno -fi]) +case `$LD -v 2>&1 </dev/null` in +*GNU* | *'with BFD'*) + acl_cv_prog_gnu_ld=3Dyes ;; +*) + acl_cv_prog_gnu_ld=3Dno ;; +esac]) with_gnu_ld=3D$acl_cv_prog_gnu_ld ]) =20 @@ -88,11 +87,12 @@ # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > = /dev/null; then - test "$with_gnu_ld" !=3D no && break - else - test "$with_gnu_ld" !=3D yes && break - fi + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" !=3D no && break ;; + *) + test "$with_gnu_ld" !=3D yes && break ;; + esac fi done IFS=3D"$ac_save_ifs" Modified: trunk/licq/m4/lib-link.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/lib-link.m4?rev=3D4568&r= 1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/lib-link.m4 (original) +++ trunk/licq/m4/lib-link.m4 Tue Aug 15 21:38:24 2006 @@ -1,12 +1,12 @@ -# lib-link.m4 serial 4 (gettext-0.12) -dnl Copyright (C) 2001-2003 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 -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. +# lib-link.m4 serial 6 (gettext-0.14.3) +dnl Copyright (C) 2001-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. =20 dnl From Bruno Haible. + +AC_PREREQ(2.50) =20 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. @@ -95,6 +95,8 @@ dnl hardcode_direct, hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ + dnl Tell automake >=3D 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host @@ -350,7 +352,7 @@ if test "X$additional_includedir" =3D "X/usr/local/include= "; then if test -n "$GCC"; then case $host_os in - linux*) haveit=3Dyes;; + linux* | gnu* | k*bsd*-gnu) haveit=3Dyes;; esac fi fi @@ -399,7 +401,7 @@ if test "X$additional_libdir" =3D "X/usr/local/lib";= then if test -n "$GCC"; then case $host_os in - linux*) haveit=3Dyes;; + linux* | gnu* | k*bsd*-gnu) haveit=3Dyes;; esac fi fi Modified: trunk/licq/m4/lib-prefix.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/lib-prefix.m4?rev=3D4568= &r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/lib-prefix.m4 (original) +++ trunk/licq/m4/lib-prefix.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# lib-prefix.m4 serial 2 (gettext-0.12) -dnl Copyright (C) 2001-2003 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 -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. +# lib-prefix.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 2001-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. =20 dnl From Bruno Haible. =20 @@ -13,7 +11,7 @@ dnl require excessive bracketing. ifdef([AC_HELP_STRING], [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) =20 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are need= ed dnl to access previously installed libraries. The basic assumption is that @@ -71,7 +69,7 @@ if test "X$additional_includedir" =3D "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=3Dyes;; + linux* | gnu* | k*bsd*-gnu) haveit=3Dyes;; esac fi fi Modified: trunk/licq/m4/nls.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/nls.m4?rev=3D4568&r1=3D4= 567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/nls.m4 (original) +++ trunk/licq/m4/nls.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# nls.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 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 -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. +# nls.m4 serial 2 (gettext-0.14.3) +dnl Copyright (C) 1995-2003, 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. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -19,6 +17,8 @@ dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2003. =20 +AC_PREREQ(2.50) + AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) @@ -32,6 +32,8 @@ =20 AC_DEFUN([AM_MKINSTALLDIRS], [ + dnl Tell automake >=3D 1.10 to complain if mkinstalldirs is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])]) dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl Try to locate it. Modified: trunk/licq/m4/po.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/po.m4?rev=3D4568&r1=3D45= 67&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/po.m4 (original) +++ trunk/licq/m4/po.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# po.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 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 -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. +# po.m4 serial 7 (gettext-0.14.3) +dnl Copyright (C) 1995-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. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -19,6 +17,8 @@ dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2003. =20 +AC_PREREQ(2.50) + dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ @@ -34,7 +34,7 @@ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. dnl The second test excludes FreeBSD msgfmt. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep us= age >/dev/null; then exit 1; else exit 0; fi)], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) @@ -43,7 +43,7 @@ dnl The first test excludes Solaris xgettext and early GNU xgettext vers= ions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs-add= ress=3D /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs-add= ress=3D /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs= -address=3D /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1;= else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. @@ -51,7 +51,7 @@ =20 dnl Search for GNU msgmerge 0.11 or newer in the PATH. AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD= [ 2>&1], :) =20 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. @@ -106,12 +106,15 @@ /*) top_srcdir=3D"$ac_given_srcdir" ;; *) top_srcdir=3D"$ac_dots$ac_given_srcdir" ;; esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || = echo "creating $ac_dir/POTFILES" cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "= /^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\= 1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS=3D"POTFILES.in" - # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES de= pend + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES de= pend # on $ac_dir but don't depend on user-specified configuration # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then @@ -119,7 +122,7 @@ if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in con= figure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obso= lete" fi - ALL_LINGUAS_=3D`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGU= AS"` + ALL_LINGUAS_=3D`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/= $ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=3D$ALL_LINGUAS_' POMAKEFILEDEPS=3D"$POMAKEFILEDEPS LINGUAS" @@ -127,19 +130,27 @@ # The set of available languages was given in configure.in. eval 'ALL_LINGUAS''=3D$OBSOLETE_ALL_LINGUAS' fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) case "$ac_given_srcdir" in .) srcdirpre=3D ;; *) srcdirpre=3D'$(srcdir)/' ;; esac POFILES=3D - GMOFILES=3D UPDATEPOFILES=3D DUMMYPOFILES=3D + GMOFILES=3D for lang in $ALL_LINGUAS; do POFILES=3D"$POFILES $srcdirpre$lang.po" - GMOFILES=3D"$GMOFILES $srcdirpre$lang.gmo" UPDATEPOFILES=3D"$UPDATEPOFILES $lang.po-update" DUMMYPOFILES=3D"$DUMMYPOFILES $lang.nop" + GMOFILES=3D"$GMOFILES $srcdirpre$lang.gmo" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. @@ -174,7 +185,7 @@ done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || = echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =3D/r $ac_dir/POTFILES" -e "/^# Makevars/r $a= c_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILE= S@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES= @|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$PO= MAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + sed -e "/^POTFILES =3D/r $ac_dir/POTFILES" -e "/^# Makevars/r $a= c_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEP= OFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOF= ILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$PO= MAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in @@ -188,10 +199,231 @@ esac done], [# Capture the value of obsolete ALL_LINGUAS because we need it to comp= ute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake. eval 'OBSOLETE_ALL_LINGUAS''=3D"$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS=3D"${LINGUAS-%UNSET%}" ]) ]) + +dnl Postprocesses a Makefile in a directory containing PO files. +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +[ + # When this code is run, in config.status, two variables have already be= en + # set: + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, + # - LINGUAS is the value of the environment variable LINGUAS at configure + # time. + +changequote(,)dnl + # Adjust a relative srcdir. + ac_dir=3D`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=3D"/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=3D`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir=3D"$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=3D`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir=3D"$ac_given_srcdir" ;; + *) top_srcdir=3D"$ac_dots$ac_given_srcdir" ;; + esac + + # Find a way to echo strings without interpreting backslash. + if test "X`(echo '\t') 2>/dev/null`" =3D 'X\t'; then + gt_echo=3D'echo' + else + if test "X`(printf '%s\n' '\t') 2>/dev/null`" =3D 'X\t'; then + gt_echo=3D'printf %s\n' + else + echo_func () { + cat <<EOT +$* +EOT + } + gt_echo=3D'echo_func' + fi + fi + + # A sed script that extracts the value of VARIABLE from a Makefile. + sed_x_variable=3D' +# Test if the hold space is empty. +x +s/P/P/ +x +ta +# Yes it was empty. Look if we have the expected variable definition. +/^[ ]*VARIABLE[ ]*=3D/{ + # Seen the first line of the variable definition. + s/^[ ]*VARIABLE[ ]*=3D// + ba +} +bd +:a +# Here we are processing a line from the variable definition. +# Remove comment, more precisely replace it with a space. +s/#.*$/ / +# See if the line ends in a backslash. +tb +:b +s/\\$// +# Print the line, without the trailing backslash. +p +tc +# There was no trailing backslash. The end of the variable definition is +# reached. Clear the hold space. +s/^.*$// +x +bd +:c +# A trailing backslash means that the variable definition continues in the +# next line. Put a nonempty string into the hold space to indicate this. +s/^.*$/P/ +x +:d +' +changequote([,])dnl + + # Set POTFILES to the value of the Makefile variable POTFILES. + sed_x_POTFILES=3D"`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's= /VARIABLE/POTFILES/g'`" + POTFILES=3D`sed -n -e "$sed_x_POTFILES" < "$ac_file"` + # Compute POTFILES_DEPS as + # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) + POTFILES_DEPS=3D + for file in $POTFILES; do + POTFILES_DEPS=3D"$POTFILES_DEPS "'$(top_srcdir)/'"$file" + done + POMAKEFILEDEPS=3D"" + + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in = is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + ALL_LINGUAS_=3D`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/= LINGUAS"` + POMAKEFILEDEPS=3D"$POMAKEFILEDEPS LINGUAS" + else + # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. + sed_x_LINGUAS=3D"`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e '= s/VARIABLE/LINGUAS/g'`" + ALL_LINGUAS_=3D`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` + fi + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=3D$ALL_LINGUAS_' + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + # Compute PROPERTIESFILES + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang= )=2Eproperties) + # Compute CLASSFILES + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang= )=2Eclass) + # Compute QMFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) + # Compute MSGFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) + # Compute RESOURCESDLLFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DO= MAIN).resources.dll) + case "$ac_given_srcdir" in + .) srcdirpre=3D ;; + *) srcdirpre=3D'$(srcdir)/' ;; + esac + POFILES=3D + UPDATEPOFILES=3D + DUMMYPOFILES=3D + GMOFILES=3D + PROPERTIESFILES=3D + CLASSFILES=3D + QMFILES=3D + MSGFILES=3D + RESOURCESDLLFILES=3D + for lang in $ALL_LINGUAS; do + POFILES=3D"$POFILES $srcdirpre$lang.po" + UPDATEPOFILES=3D"$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES=3D"$DUMMYPOFILES $lang.nop" + GMOFILES=3D"$GMOFILES $srcdirpre$lang.gmo" + PROPERTIESFILES=3D"$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.pr= operties" + CLASSFILES=3D"$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" + QMFILES=3D"$QMFILES $srcdirpre$lang.qm" + frobbedlang=3D`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQ= RSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + MSGFILES=3D"$MSGFILES $srcdirpre$frobbedlang.msg" + frobbedlang=3D`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e '= s/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's= /^uz-UZ$/uz-UZ-Latn/'` + RESOURCESDLLFILES=3D"$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMA= IN).resources.dll" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS=3D + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=3Dno + if test "%UNSET%" !=3D "$LINGUAS"; then + desiredlanguages=3D"$LINGUAS" + else + desiredlanguages=3D"$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=3Dyes;; + esac + done + if test $useit =3D yes; then + INST_LINGUAS=3D"$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS=3D + JAVACATALOGS=3D + QTCATALOGS=3D + TCLCATALOGS=3D + CSHARPCATALOGS=3D + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS=3D"$CATALOGS $lang.gmo" + JAVACATALOGS=3D"$JAVACATALOGS \$(DOMAIN)_$lang.properties" + QTCATALOGS=3D"$QTCATALOGS $lang.qm" + frobbedlang=3D`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNO= PQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + TCLCATALOGS=3D"$TCLCATALOGS $frobbedlang.msg" + frobbedlang=3D`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e= 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e = 's/^uz-UZ$/uz-UZ-Latn/'` + CSHARPCATALOGS=3D"$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.= dll" + done + fi + + sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" = -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|= g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g= " -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGF= ILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@C= ATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALO= GS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOG= S@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.= tmp" + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=3D`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNO= PQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + cat >> "$ac_file.tmp" <<EOF +$frobbedlang.msg: $lang.po + @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ + \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -= f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +EOF + done + fi + if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=3D`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e= 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e = 's/^uz-UZ$/uz-UZ-Latn/'` + cat >> "$ac_file.tmp" <<EOF +$frobbedlang/\$(DOMAIN).resources.dll: $lang.po + @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -= r \$(DOMAIN)"; \ + \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$= (DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +EOF + done + fi + if test -n "$POMAKEFILEDEPS"; then + cat >> "$ac_file.tmp" <<EOF +Makefile: $POMAKEFILEDEPS +EOF + fi + mv "$ac_file.tmp" "$ac_file" +]) Modified: trunk/licq/m4/progtest.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/progtest.m4?rev=3D4568&r= 1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/progtest.m4 (original) +++ trunk/licq/m4/progtest.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# progtest.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1996-2003 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 -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. +# progtest.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1996-2003, 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. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -17,6 +15,8 @@ =20 dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1996. + +AC_PREREQ(2.50) =20 # Search path for a program which passes the given test. =20 @@ -67,6 +67,7 @@ test -z "$ac_dir" && ac_dir=3D. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD if [$3]; then ac_cv_path_$1=3D"$ac_dir/$ac_word$ac_exec_ext" break 2 Modified: trunk/licq/m4/stdint_h.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/stdint_h.m4?rev=3D4568&r= 1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/stdint_h.m4 (original) +++ trunk/licq/m4/stdint_h.m4 Tue Aug 15 21:38:24 2006 @@ -1,26 +1,24 @@ -# stdint_h.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1997-2003 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 -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. +# stdint_h.m4 serial 5 +dnl Copyright (C) 1997-2004 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. =20 dnl From Paul Eggert. =20 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, # doesn't clash with <sys/types.h>, and declares uintmax_t. =20 -AC_DEFUN([jm_AC_HEADER_STDINT_H], +AC_DEFUN([gl_AC_HEADER_STDINT_H], [ - AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, [AC_TRY_COMPILE( [#include <sys/types.h> #include <stdint.h>], [uintmax_t i =3D (uintmax_t) -1;], - jm_ac_cv_header_stdint_h=3Dyes, - jm_ac_cv_header_stdint_h=3Dno)]) - if test $jm_ac_cv_header_stdint_h =3D yes; then + gl_cv_header_stdint_h=3Dyes, + gl_cv_header_stdint_h=3Dno)]) + if test $gl_cv_header_stdint_h =3D yes; then AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) Modified: trunk/licq/m4/uintmax_t.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/uintmax_t.m4?rev=3D4568&= r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/uintmax_t.m4 (original) +++ trunk/licq/m4/uintmax_t.m4 Tue Aug 15 21:38:24 2006 @@ -1,10 +1,8 @@ -# uintmax_t.m4 serial 7 (gettext-0.12) -dnl Copyright (C) 1997-2003 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 -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. +# uintmax_t.m4 serial 9 +dnl Copyright (C) 1997-2004 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. =20 dnl From Paul Eggert. =20 @@ -13,12 +11,12 @@ # Define uintmax_t to 'unsigned long' or 'unsigned long long' # if it is not already defined in <stdint.h> or <inttypes.h>. =20 -AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +AC_DEFUN([gl_AC_TYPE_UINTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - if test $jm_ac_cv_header_inttypes_h =3D no && test $jm_ac_cv_header_stdi= nt_h =3D no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + if test $gl_cv_header_inttypes_h =3D no && test $gl_cv_header_stdint_h = =3D no; then + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) test $ac_cv_type_unsigned_long_long =3D yes \ && ac_type=3D'unsigned long long' \ || ac_type=3D'unsigned long' Modified: trunk/licq/m4/ulonglong.m4 URL: http://svn.licq.org/viewvc/licq/trunk/licq/m4/ulonglong.m4?rev=3D4568&= r1=3D4567&r2=3D4568&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/licq/m4/ulonglong.m4 (original) +++ trunk/licq/m4/ulonglong.m4 Tue Aug 15 21:38:24 2006 @@ -1,23 +1,23 @@ -# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -dnl Copyright (C) 1999-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 -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. +# ulonglong.m4 serial 4 +dnl Copyright (C) 1999-2004 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. =20 dnl From Paul Eggert. =20 -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. + +AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull =3D 1; int i =3D 63;], + [AC_TRY_LINK([unsigned long long ull =3D 1ULL; int i =3D 63;], [unsigned long long ullmax =3D (unsigned long long) -1; return ull << i | ull >> i | ullmax / ull | ullmax % ull;], ac_cv_type_unsigned_long_long=3Dyes, ac_cv_type_unsigned_long_long=3Dno)]) if test $ac_cv_type_unsigned_long_long =3D yes; then AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the unsigned long long type.]) + [Define if you have the 'unsigned long long' type.]) fi ]) |