Changeset 8b71b1041b0ba6304f864c977c1a2dceb725a0cd

Timestamp:

03/07/08 14:32:46 (6 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1204896766 +0200

git-parent:

[63a70e878979786e01b5d6015eab3076fd92e147]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1204896766 +0200

Message:

Update gettext

Files:

• configure.ac (modified) (1 diff)
• m4/gettext.m4 (modified) (2 diffs)
• m4/iconv.m4 (modified) (4 diffs)
• m4/intdiv0.m4 (modified) (3 diffs)
• m4/intl.m4 (modified) (5 diffs)
• m4/lib-link.m4 (modified) (24 diffs)
• m4/lock.m4 (modified) (2 diffs)
• m4/uintmax_t.m4 (modified) (2 diffs)
• po/Makefile.in.in (modified) (5 diffs)

configure.ac

@@ -393 +393 @@
-dnl Gettext stuff
-dnl
-6.1
+7
-AM_GNU_GETTEXT([external])
-VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])

m4/gettext.m4

@@ -1 @@
-59 (gettext-0.16.1
-6
+60 (gettext-0.17
+7
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -363 +363 @@
-
-
-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_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue 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_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = 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=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],

m4/iconv.m4

@@ -1 @@
-4 (gettext-0.11.3
-
+6 (gettext-0.17
+, 2007
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -22 +22 @@
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
@@ -34 +35 @@
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-for iconv
+[for iconv]
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
@@ -57 +58 @@
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  fi
-  if test "$am_cv_lib_iconv" = yes; then

m4/intdiv0.m4

@@ -1 @@
-1 (gettext-0.11.3
-
+2 (gettext-0.17
+, 2007
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -15 +15 @@
-    gt_cv_int_divbyzero_sigfpe,
-    [
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
@@ -52 +63 @@
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in

m4/intl.m4

@@ -1 @@
-3 (gettext-0.16
-6
+8 (gettext-0.17
+7
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -34 +34 @@
-  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
@@ -99 +98 @@
-  if test "$enable_shared" = yes; then
-    case "$host_os" in
-
+mingw* | 
-      *) is_woe32dll=no ;;
-    esac
@@ -107 +106 @@
-  WOE32DLL=$is_woe32dll
-  AC_SUBST([WOE32DLL])
+
+  dnl On mingw and Cygwin, we can activate special Makefile rules which add
+  dnl version information to the shared libraries and executables.
+  case "$host_os" in
+    mingw* | cygwin*) is_woe32=yes ;;
+    *) is_woe32=no ;;
+  esac
+  WOE32=$is_woe32
+  AC_SUBST([WOE32])
+  if test $WOE32 = yes; then
+    dnl Check for a program that compiles Windows resource files.
+    AC_CHECK_TOOL([WINDRES], [windres])
+  fi
+
+  dnl Determine whether when creating a library, "-lc" should be passed to
+  dnl libtool or not. On many platforms, it is required for the libtool option
+  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
+  dnl in the *.la files - makes it impossible to create multithreaded programs,
+  dnl because libtool also reorders the -lc to come before the -pthread, and
+  dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
+  case "$host_os" in
+    hpux*) LTLIBC="" ;;
+    *)     LTLIBC="-lc" ;;
+  esac
+  AC_SUBST([LTLIBC])
-
-  dnl Rename some macros and functions used for locking.
@@ -198 +222 @@
-    [AC_TRY_LINK([#include <langinfo.h>
-#include <locale.h>],
-
+
+
+
-      gt_cv_nl_locale_name=yes,
-      gt_cv_nl_locale_name=no)

m4/lib-link.m4

@@ -1 @@
-9 (gettext-0.16
-6
+13 (gettext-0.17
+7
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -7 +7 @@
-dnl From Bruno Haible.
-
-0
+4
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
@@ -13 +13 @@
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
@@ -25 +27 @@
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
@@ -47 +52 @@
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
@@ -83 +90 @@
-    LIB[]NAME=
-    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
-  undefine([Name])
-  undefine([NAME])
@@ -92 +101 @@
-
-dnl Determine the platform dependent parameters needed to use rpath:
-
-
+
+
+
+
+
+
-AC_DEFUN([AC_LIB_RPATH],
-[
@@ -110 +123 @@
-  ])
-  wl="$acl_cv_wl"
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
@@ -125 +140 @@
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
@@ -130 +147 @@
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
@@ -136 +155 @@
-    eval additional_libdir=\"$libdir\"
-  ])
-$1
-$1
-$1
+]N_A_M_E[
+]N_A_M_E[
+]N_A_M_E[
-[
-    if test "X$withval" = "Xno"; then
@@ -159 +178 @@
-  LTLIB[]NAME=
-  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
-  rpathdirs=
-  ltrpathdirs=
@@ -198 +218 @@
-          found_so=
-          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
-          if test $use_additional = yes; then
-if test -n "$shlibext" \
-   && { test -f "$additional_libdir/lib$name.$shlibext" \
-        || { test "$shlibext" = dll \
-             && test -f "$additional_libdir/lib$name.dll.a"; }; }
-found_dir="$additional_libdir"
-if test -f "$additional_libdir/lib$name.$shlibext"; then
-additional_libdir/lib$name.$shlib
+dir="$additional_libdir"
+dnl The same code as in the loop below:
+dnl First look for a shared library.
+if test -n "$acl_shlibext"
+if test -f "$dir/$libname$shrext"; then
+  found_dir="$dir"
+dir/$libname$shr
-              else
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              fi
-
-
+
+
+
+
+
+
-              fi
-
-
-
-
-
-
-
+
+
+
+
-              fi
-            fi
@@ -228 +274 @@
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-
-
-
-
-
-
-
+
+
+
+
+
-                    else
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      found_dir="$dir"
-
-
-
-
+
+
+
+
+
+
-                    fi
-                  fi
@@ -283 +347 @@
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-
+acl_
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-hardcode_libdir_flag_spec" && test "$
+acl_hardcode_libdir_flag_spec" && test "$acl_
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
@@ -319 +383 @@
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-
+acl_
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
@@ -325 +389 @@
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-
+acl_
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
@@ -352 +416 @@
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
-                additional_includedir="$basedir/include"
-                ;;
@@ -513 +578 @@
-  done
-  if test "X$rpathdirs" != "X"; then
-
+acl_
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
@@ -519 +584 @@
-      alldirs=
-      for found_dir in $rpathdirs; do
-
+acl_
-      done
-
+acl_
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-
+acl_
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
@@ -532 +597 @@
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-
+acl_
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
@@ -581 +646 @@
-  $1=
-  if test "$enable_rpath" != no; then
-hardcode_libdir_flag_spec" && test "$
+acl_hardcode_libdir_flag_spec" && test "$acl_
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
@@ -615 +680 @@
-        else
-          dnl The linker is used for linking directly.
-
+acl_
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-
+acl_
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-
+acl_
-            libdir="$acl_save_libdir"
-            $1="$flag"
@@ -632 +697 @@
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-
+acl_
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"

m4/lock.m4

@@ -1 @@
-6 (gettext-0.16
-6
+7 (gettext-0.17
+7
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -36 +36 @@
-
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
+
+
+
+
+
+
-  dnl Check for multithreading.
-  AC_ARG_ENABLE(threads,

m4/uintmax_t.m4

@@ -1 @@
-9
-
+10
+, 2007
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
@@ -17 +17 @@
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-gl_AC_TYPE_UNSIGNED_LONG_LONG
-
+AC_TYPE_UNSIGNED_LONG_LONG_INT
+_int
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'

po/Makefile.in.in

@@ -1 +1 @@
-# Makefile for PO directory in any package using GNU gettext.
-6
+7
-#
-# This file can be copied and used freely without restrictions.  It can
@@ -9 +9 @@
-# General Public License and is *not* in the public domain.
-#
-
+
+
-
-PACKAGE = @PACKAGE@
@@ -96 +97 @@
-
-
-
+check-macro-version 
-
-all-yes: stamp-po
-all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+    @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+      || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+           exit 1; \
+         }
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
@@ -131 +139 @@
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+    if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+      package_gnu='GNU '; \
+    else \
+      package_gnu=''; \
+    fi; \
-    if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-      msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -136 +149 @@
-      msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-    fi; \
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    test ! -f $(DOMAIN).po || { \
-      if test -f $(srcdir)/$(DOMAIN).pot; then \