Commit 7a508b37 authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in, m4/*, po/Makefile.in.in: build updated to use gettext 0.11.5 by default.
   This is necessary for the win32 build because old gettext versions do not work on win32.
parent 126568cf
...@@ -173,7 +173,7 @@ dnl ...@@ -173,7 +173,7 @@ dnl
dnl Gettext stuff dnl Gettext stuff
dnl dnl
ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv" ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
AM_GNU_GETTEXT_VERSION(0.10.40) AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl) AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
......
#serial AM1 # 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 From Bruno Haible. dnl From Bruno Haible.
......
This diff is collapsed.
#serial 2 # 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.
# Test for the GNU C Library, version 2.1 or newer. # Test for the GNU C Library, version 2.1 or newer.
# From Bruno Haible. # From Bruno Haible.
......
#serial AM2 # 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 From Bruno Haible. dnl From Bruno Haible.
AC_DEFUN([AM_ICONV], AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
[
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
AC_LIB_LINKFLAGS_BODY([iconv])
])
AC_DEFUN([AM_ICONV_LINK],
[ [
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed). dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix], dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ dnl accordingly.
for dir in `echo "$withval" | tr : ' '`; do AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi dnl Add $INCICONV to CPPFLAGS before performing the following checks,
done dnl because if the user has installed libiconv and not disabled its use
]) dnl via --without-libiconv-prefix, he wants to use it. The first
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
am_save_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_func_iconv="no, consider installing GNU libiconv"
...@@ -26,7 +46,7 @@ AC_DEFUN([AM_ICONV], ...@@ -26,7 +46,7 @@ AC_DEFUN([AM_ICONV],
am_cv_func_iconv=yes) am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS" am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv" LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <stdlib.h> AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>], #include <iconv.h>],
[iconv_t cd = iconv_open("",""); [iconv_t cd = iconv_open("","");
...@@ -39,6 +59,25 @@ AC_DEFUN([AM_ICONV], ...@@ -39,6 +59,25 @@ AC_DEFUN([AM_ICONV],
]) ])
if test "$am_cv_func_iconv" = yes; then if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
fi
if test "$am_cv_lib_iconv" = yes; then
AC_MSG_CHECKING([how to link with libiconv])
AC_MSG_RESULT([$LIBICONV])
else
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
dnl either.
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
LTLIBICONV=
fi
AC_SUBST(LIBICONV)
AC_SUBST(LTLIBICONV)
])
AC_DEFUN([AM_ICONV],
[
AM_ICONV_LINK
if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration]) AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [ AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([ AC_TRY_COMPILE([
...@@ -61,9 +100,4 @@ size_t iconv(); ...@@ -61,9 +100,4 @@ size_t iconv();
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
[Define as const if the declaration of iconv() needs const.]) [Define as const if the declaration of iconv() needs const.])
fi fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
]) ])
#serial 1 # 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.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
# This test replaces the one in autoconf. # This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro # Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package) # because gettext's gettext.m4 (distributed in the automake package)
......
# Check whether LC_MESSAGES is available in <locale.h>. # lcmessage.m4 serial 3 (gettext-0.11.3)
# Ulrich Drepper <drepper@cygnus.com>, 1995. dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
# dnl This file is free software, distributed under the terms of the GNU
# This file can be copied and used freely without restrictions. It can dnl General Public License. As a special exception to the GNU General
# be used in projects which are not available under the GNU General Public dnl Public License, this file may be distributed as part of a program
# License or the GNU Library General Public License but which still want dnl that contains a configuration script generated by Autoconf, under
# to provide support for the GNU gettext functionality. dnl the same distribution terms as the rest of that program.
# Please note that the actual code of the GNU gettext library is covered dnl
# by the GNU Library General Public License, and the rest of the GNU dnl This file can can be used in projects which are not available under
# gettext package package is covered by the GNU General Public License. dnl the GNU General Public License or the GNU Library General Public
# They are *not* in the public domain. dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
# serial 2 # Check whether LC_MESSAGES is available in <locale.h>.
AC_DEFUN([AM_LC_MESSAGES], AC_DEFUN([AM_LC_MESSAGES],
[if test $ac_cv_header_locale_h = yes; then [
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
...@@ -21,4 +29,4 @@ AC_DEFUN([AM_LC_MESSAGES], ...@@ -21,4 +29,4 @@ AC_DEFUN([AM_LC_MESSAGES],
AC_DEFINE(HAVE_LC_MESSAGES, 1, AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.]) [Define if your <locale.h> file defines LC_MESSAGES.])
fi fi
fi]) ])
# Search path for a program which passes the given test. # progtest.m4 serial 2 (gettext-0.10.40)
# Ulrich Drepper <drepper@cygnus.com>, 1996. dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
# dnl This file is free software, distributed under the terms of the GNU
# This file can be copied and used freely without restrictions. It can dnl General Public License. As a special exception to the GNU General
# be used in projects which are not available under the GNU General Public dnl Public License, this file may be distributed as part of a program
# License or the GNU Library General Public License but which still want dnl that contains a configuration script generated by Autoconf, under
# to provide support for the GNU gettext functionality. dnl the same distribution terms as the rest of that program.
# Please note that the actual code of the GNU gettext library is covered dnl
# by the GNU Library General Public License, and the rest of the GNU dnl This file can can be used in projects which are not available under
# gettext package package is covered by the GNU General Public License. dnl the GNU General Public License or the GNU Library General Public
# They are *not* in the public domain. dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
# serial 2 # Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment