Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
830fd6fc
Commit
830fd6fc
authored
Jul 21, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gettext files
parent
27e4465a
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
984 additions
and
636 deletions
+984
-636
autotools/config.rpath
autotools/config.rpath
+20
-14
configure.ac
configure.ac
+1
-1
m4/codeset.m4
m4/codeset.m4
+6
-6
m4/fcntl-o.m4
m4/fcntl-o.m4
+81
-0
m4/gettext.m4
m4/gettext.m4
+22
-20
m4/glibc2.m4
m4/glibc2.m4
+9
-9
m4/glibc21.m4
m4/glibc21.m4
+9
-9
m4/iconv.m4
m4/iconv.m4
+51
-17
m4/intdiv0.m4
m4/intdiv0.m4
+4
-4
m4/intl.m4
m4/intl.m4
+51
-42
m4/intldir.m4
m4/intldir.m4
+3
-3
m4/intlmacosx.m4
m4/intlmacosx.m4
+6
-6
m4/intmax.m4
m4/intmax.m4
+6
-6
m4/inttypes-pri.m4
m4/inttypes-pri.m4
+6
-6
m4/inttypes_h.m4
m4/inttypes_h.m4
+6
-6
m4/lcmessage.m4
m4/lcmessage.m4
+6
-5
m4/lib-ld.m4
m4/lib-ld.m4
+10
-10
m4/lib-link.m4
m4/lib-link.m4
+99
-34
m4/lib-prefix.m4
m4/lib-prefix.m4
+65
-26
m4/lock.m4
m4/lock.m4
+17
-296
m4/longlong.m4
m4/longlong.m4
+37
-40
m4/nls.m4
m4/nls.m4
+7
-6
m4/po.m4
m4/po.m4
+5
-5
m4/printf-posix.m4
m4/printf-posix.m4
+7
-6
m4/progtest.m4
m4/progtest.m4
+7
-7
m4/size_max.m4
m4/size_max.m4
+17
-10
m4/stdint_h.m4
m4/stdint_h.m4
+6
-6
m4/threadlib.m4
m4/threadlib.m4
+347
-0
m4/uintmax_t.m4
m4/uintmax_t.m4
+5
-5
m4/visibility.m4
m4/visibility.m4
+28
-6
m4/wchar_t.m4
m4/wchar_t.m4
+5
-5
m4/wint_t.m4
m4/wint_t.m4
+5
-5
m4/xsize.m4
m4/xsize.m4
+3
-3
po/Makefile.in.in
po/Makefile.in.in
+27
-12
No files found.
autotools/config.rpath
View file @
830fd6fc
...
...
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-200
7
Free Software Foundation, Inc.
# Copyright 1996-20
1
0 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
...
...
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
done
cc_basename
=
`
echo
"
$cc_temp
"
|
sed
-e
's%^.*/%%'
`
# Code taken from libtool.m4's
AC_LIBTOOL_PROG
_COMPILER_PIC.
# Code taken from libtool.m4's
_LT
_COMPILER_PIC.
wl
=
if
test
"
$GCC
"
=
yes
;
then
...
...
@@ -64,7 +64,7 @@ else
;;
esac
;;
mingw
*
|
cygwin
*
|
pw32
*
|
os2
*
)
mingw
*
|
cygwin
*
|
pw32
*
|
os2
*
|
cegcc
*
)
;;
hpux9
*
|
hpux10
*
|
hpux11
*
)
wl
=
'-Wl,'
...
...
@@ -76,7 +76,13 @@ else
;;
linux
*
|
k
*
bsd
*
-gnu
)
case
$cc_basename
in
icc
*
|
ecc
*
)
ecc
*
)
wl
=
'-Wl,'
;;
icc
*
|
ifort
*
)
wl
=
'-Wl,'
;;
lf95
*
)
wl
=
'-Wl,'
;;
pgcc
|
pgf77
|
pgf90
)
...
...
@@ -124,7 +130,7 @@ else
esac
fi
# Code taken from libtool.m4's
AC_LIBTOOL_PROG_LD
_SHLIBS.
# Code taken from libtool.m4's
_LT_LINKER
_SHLIBS.
hardcode_libdir_flag_spec
=
hardcode_libdir_separator
=
...
...
@@ -132,7 +138,7 @@ hardcode_direct=no
hardcode_minus_L
=
no
case
"
$host_os
"
in
cygwin
*
|
mingw
*
|
pw32
*
)
cygwin
*
|
mingw
*
|
pw32
*
|
cegcc
*
)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
...
...
@@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec
=
'${wl}-rpath ${wl}$libdir'
case
"
$host_os
"
in
aix
3
*
|
aix4
*
|
aix5
*
)
aix
[3-9]
*
)
# On AIX/PPC, the GNU linker is very broken
if
test
"
$host_cpu
"
!=
ia64
;
then
ld_shlibs
=
no
...
...
@@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs
=
no
fi
;;
cygwin
*
|
mingw
*
|
pw32
*
)
cygwin
*
|
mingw
*
|
pw32
*
|
cegcc
*
)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec
=
'-L$libdir'
...
...
@@ -254,7 +260,7 @@ else
hardcode_direct
=
unsupported
fi
;;
aix
4
*
|
aix5
*
)
aix
[4-9]
*
)
if
test
"
$host_cpu
"
=
ia64
;
then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
...
...
@@ -264,7 +270,7 @@ else
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
case
$host_os
in
aix4.[23]|aix4.[23].
*
|
aix
5
*
)
case
$host_os
in
aix4.[23]|aix4.[23].
*
|
aix
[5-9]
*
)
for
ld_flag
in
$LDFLAGS
;
do
if
(
test
$ld_flag
=
"-brtl"
||
test
$ld_flag
=
"-Wl,-brtl"
)
;
then
aix_use_runtimelinking
=
yes
...
...
@@ -326,7 +332,7 @@ else
;;
bsdi[45]
*
)
;;
cygwin
*
|
mingw
*
|
pw32
*
)
cygwin
*
|
mingw
*
|
pw32
*
|
cegcc
*
)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
...
...
@@ -494,7 +500,7 @@ else
fi
# Check dynamic linker characteristics
# Code taken from libtool.m4's
AC_LIBTOOL
_SYS_DYNAMIC_LINKER.
# Code taken from libtool.m4's
_LT
_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
...
...
@@ -505,7 +511,7 @@ case "$host_os" in
aix3
*
)
library_names_spec
=
'$libname.a'
;;
aix
4
*
|
aix5
*
)
aix
[4-9]
*
)
library_names_spec
=
'$libname$shrext'
;;
amigaos
*
)
...
...
@@ -517,7 +523,7 @@ case "$host_os" in
bsdi[45]
*
)
library_names_spec
=
'$libname$shrext'
;;
cygwin
*
|
mingw
*
|
pw32
*
)
cygwin
*
|
mingw
*
|
pw32
*
|
cegcc
*
)
shrext
=
.dll
library_names_spec
=
'$libname.dll.a $libname.lib'
;;
...
...
configure.ac
View file @
830fd6fc
...
...
@@ -428,7 +428,7 @@ AS_IF([test "${enable_shared}" = "no"], [
dnl
dnl Gettext stuff
dnl
AM_GNU_GETTEXT_VERSION([0.1
7
])
AM_GNU_GETTEXT_VERSION([0.1
8.1
])
AM_GNU_GETTEXT([external])
VLC_ADD_LIBS([libvlccore vlc], [${LTLIBINTL}])
...
...
m4/codeset.m4
View file @
830fd6fc
# codeset.m4 serial
2
(gettext-0.1
6
)
dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
# codeset.m4 serial
4
(gettext-0.1
8
)
dnl Copyright (C) 2000-2002, 2006
, 2008-2010
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.
...
...
@@ -8,14 +8,14 @@ dnl From Bruno Haible.
AC_DEFUN([AM_LANGINFO_CODESET],
[
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
AC_CACHE_CHECK([for nl_langinfo and CODESET],
[
am_cv_langinfo_codeset
]
,
[AC_TRY_LINK([#include <langinfo.h>],
[char* cs = nl_langinfo(CODESET); return !cs;],
am_cv_langinfo_codeset=yes,
am_cv_langinfo_codeset=no)
[
am_cv_langinfo_codeset=yes
]
,
[
am_cv_langinfo_codeset=no
]
)
])
if test $am_cv_langinfo_codeset = yes; then
AC_DEFINE(HAVE_LANGINFO_CODESET,
1
,
AC_DEFINE(
[
HAVE_LANGINFO_CODESET
]
,
[1]
,
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
m4/fcntl-o.m4
0 → 100644
View file @
830fd6fc
# fcntl-o.m4 serial 1
dnl Copyright (C) 2006, 2009-2010 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 Written by Paul Eggert.
# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
AC_DEFUN([gl_FCNTL_O_FLAGS],
[
dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#ifndef O_NOATIME
#define O_NOATIME 0
#endif
#ifndef O_NOFOLLOW
#define O_NOFOLLOW 0
#endif
static int const constants[] =
{
O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
};
]],
[[
int status = !constants;
{
static char const sym[] = "conftest.sym";
if (symlink (".", sym) != 0
|| close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
status |= 32;
unlink (sym);
}
{
static char const file[] = "confdefs.h";
int fd = open (file, O_RDONLY | O_NOATIME);
char c;
struct stat st0, st1;
if (fd < 0
|| fstat (fd, &st0) != 0
|| sleep (1) != 0
|| read (fd, &c, 1) != 1
|| close (fd) != 0
|| stat (file, &st1) != 0
|| st0.st_atime != st1.st_atime)
status |= 64;
}
return status;]])],
[gl_cv_header_working_fcntl_h=yes],
[case $? in #(
32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
*) gl_cv_header_working_fcntl_h='no';;
esac],
[gl_cv_header_working_fcntl_h=cross-compiling])])
case $gl_cv_header_working_fcntl_h in #(
*O_NOATIME* | no | cross-compiling) ac_val=0;; #(
*) ac_val=1;;
esac
AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
[Define to 1 if O_NOATIME works.])
case $gl_cv_header_working_fcntl_h in #(
*O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
*) ac_val=1;;
esac
AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
[Define to 1 if O_NOFOLLOW works.])
])
m4/gettext.m4
View file @
830fd6fc
# gettext.m4 serial 6
0
(gettext-0.1
7
)
dnl Copyright (C) 1995-200
7
Free Software Foundation, Inc.
# gettext.m4 serial 6
3
(gettext-0.1
8
)
dnl Copyright (C) 1995-20
1
0 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.
...
...
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006
, 2008-2010
.
dnl Macro to add for using GNU gettext.
...
...
@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
])])])])])
ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
[AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
...
...
@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
gt_use_preinstalled_gnugettext=no
ifelse(gt_included_intl, yes, [
AC_MSG_CHECKING([whether included gettext is requested])
AC_ARG_WITH(included-gettext,
AC_ARG_WITH(
[
included-gettext
]
,
[ --with-included-gettext use the GNU gettext library included here],
nls_cv_force_use_gnu_gettext=$withval,
nls_cv_force_use_gnu_gettext=no)
AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
AC_MSG_RESULT(
[
$nls_cv_force_use_gnu_gettext
]
)
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
...
...
@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
AC_DEFINE(ENABLE_NLS,
1
,
AC_DEFINE(
[
ENABLE_NLS
]
,
[1]
,
[Define to 1 if translation of program messages to the user's native language
is requested.])
else
...
...
@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
fi
dnl For backward compatibility. Some packages may be using this.
AC_DEFINE(HAVE_GETTEXT,
1
,
AC_DEFINE(
[
HAVE_GETTEXT
]
,
[1]
,
[Define if the GNU gettext() function is already present or preinstalled.])
AC_DEFINE(HAVE_DCGETTEXT,
1
,
AC_DEFINE(
[
HAVE_DCGETTEXT
]
,
[1]
,
[Define if the GNU dcgettext() function is already present or preinstalled.])
fi
...
...
@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
fi
dnl Make all variables we use known to autoconf.
AC_SUBST(BUILD_INCLUDED_LIBINTL)
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT)
AC_SUBST(
[
BUILD_INCLUDED_LIBINTL
]
)
AC_SUBST(
[
USE_INCLUDED_LIBINTL
]
)
AC_SUBST(
[
CATOBJEXT
]
)
dnl For backward compatibility. Some configure.ins may be using this.
nls_cv_header_intl=
...
...
@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
dnl For backward compatibility. Some Makefiles may be using this.
DATADIRNAME=share
AC_SUBST(DATADIRNAME)
AC_SUBST(
[
DATADIRNAME
]
)
dnl For backward compatibility. Some Makefiles may be using this.
INSTOBJEXT=.mo
AC_SUBST(INSTOBJEXT)
AC_SUBST(
[
INSTOBJEXT
]
)
dnl For backward compatibility. Some Makefiles may be using this.
GENCAT=gencat
AC_SUBST(GENCAT)
AC_SUBST(
[
GENCAT
]
)
dnl For backward compatibility. Some Makefiles may be using this.
INTLOBJS=
if test "$USE_INCLUDED_LIBINTL" = yes; then
INTLOBJS="\$(GETTOBJS)"
fi
AC_SUBST(INTLOBJS)
AC_SUBST(
[
INTLOBJS
]
)
dnl Enable libtool support if the surrounding package wishes it.
INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
AC_SUBST(
[
INTL_LIBTOOL_SUFFIX_PREFIX
]
)
])
dnl For backward compatibility. Some Makefiles may be using this.
INTLLIBS="$LIBINTL"
AC_SUBST(INTLLIBS)
AC_SUBST(
[
INTLLIBS
]
)
dnl Make all documented variables known to autoconf.
AC_SUBST(LIBINTL)
AC_SUBST(LTLIBINTL)
AC_SUBST(POSUB)
AC_SUBST(
[
LIBINTL
]
)
AC_SUBST(
[
LTLIBINTL
]
)
AC_SUBST(
[
POSUB
]
)
])
...
...
m4/glibc2.m4
View file @
830fd6fc
# glibc2.m4 serial
1
dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
# glibc2.m4 serial
2
dnl Copyright (C) 2000-2002, 2004
, 2008-2010
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.
...
...
@@ -9,22 +9,22 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gt_GLIBC2],
[
AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
ac_cv_gnu_library_2,
AC_CACHE_CHECK(
[
whether we are using the GNU C Library 2 or newer
]
,
[
ac_cv_gnu_library_2
]
,
[AC_EGREP_CPP([Lucky GNU user],
[
[
#include <features.h>
#ifdef __GNU_LIBRARY__
#if (__GLIBC__ >= 2)
Lucky GNU user
#endif
#endif
],
ac_cv_gnu_library_2=yes,
ac_cv_gnu_library_2=no)
],
[
ac_cv_gnu_library_2=yes
]
,
[
ac_cv_gnu_library_2=no
]
)
]
)
AC_SUBST(GLIBC2)
AC_SUBST(
[
GLIBC2
]
)
GLIBC2="$ac_cv_gnu_library_2"
]
)
m4/glibc21.m4
View file @
830fd6fc
# glibc21.m4 serial
3
dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
# glibc21.m4 serial
4
dnl Copyright (C) 2000-2002, 2004
, 2008-2010
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.
...
...
@@ -9,22 +9,22 @@ dnl with or without modifications, as long as this notice is preserved.
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,
AC_CACHE_CHECK(
[
whether we are using the GNU C Library 2.1 or newer
]
,
[
ac_cv_gnu_library_2_1
]
,
[AC_EGREP_CPP([Lucky GNU user],
[
[
#include <features.h>
#ifdef __GNU_LIBRARY__
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
Lucky GNU user
#endif
#endif
],
ac_cv_gnu_library_2_1=yes,
ac_cv_gnu_library_2_1=no)
],
[
ac_cv_gnu_library_2_1=yes
]
,
[
ac_cv_gnu_library_2_1=no
]
)
]
)
AC_SUBST(GLIBC21)
AC_SUBST(
[
GLIBC21
]
)
GLIBC21="$ac_cv_gnu_library_2_1"
]
)
m4/iconv.m4
View file @
830fd6fc
# iconv.m4 serial
AM6
(gettext-0.1
7
)
dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
# iconv.m4 serial
11
(gettext-0.1
8.1
)
dnl Copyright (C) 2000-2002, 2007
-2010
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.
...
...
@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
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_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
...
...
@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
[
am_cv_func_iconv=yes
]
)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
...
...
@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
[
am_cv_lib_iconv=yes
]
[
am_cv_func_iconv=yes
]
)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
dnl This tests against bugs in AIX 5.1
and
HP-UX 11.11.
AC_CACHE_CHECK([for working iconv],
[
am_cv_func_iconv_works
]
, [
dnl This tests against bugs in AIX 5.1
,
HP-UX 11.11
, Solaris 10
.
am_save_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
...
...
@@ -87,6 +87,25 @@ int main ()
return 1;
}
}
/* Test against Solaris 10 bug: Failures are not distinguishable from
successful returns. */
{
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
if (cd_ascii_to_88591 != (iconv_t)(-1))
{
static const char input[] = "\263";
char buf[10];
const char *inptr = input;
size_t inbytesleft = strlen (input);
char *outptr = buf;
size_t outbytesleft = sizeof (buf);
size_t res = iconv (cd_ascii_to_88591,
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
return 1;
}
}
#if 0 /* This bug could be worked around by the caller. */
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
{
...
...
@@ -134,7 +153,7 @@ int main ()
am_func_iconv=no am_cv_lib_iconv=no
fi
if test "$am_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV,
1
,
AC_DEFINE(
[
HAVE_ICONV
]
,
[1]
,
[Define if you have the iconv() function and it works.])
fi
if test "$am_cv_lib_iconv" = yes; then
...
...
@@ -147,16 +166,31 @@ int main ()
LIBICONV=
LTLIBICONV=
fi
AC_SUBST(LIBICONV)
AC_SUBST(LTLIBICONV)
AC_SUBST(
[
LIBICONV
]
)
AC_SUBST(
[
LTLIBICONV
]
)
])
AC_DEFUN([AM_ICONV],
dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
dnl avoid warnings like
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
dnl This is tricky because of the way 'aclocal' is implemented:
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
dnl warnings.
m4_define([gl_iconv_AC_DEFUN],
m4_version_prereq([2.64],
[[AC_DEFUN_ONCE(
[$1], [$2])]],
[[AC_DEFUN(
[$1], [$2])]]))
gl_iconv_AC_DEFUN([AM_ICONV],
[
AM_ICONV_LINK
if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_CACHE_VAL(
[
am_cv_proto_iconv
]
, [
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
...
...
@@ -169,12 +203,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
#else
size_t iconv();
#endif
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
], [],
[
am_cv_proto_iconv_arg1=""
]
,
[
am_cv_proto_iconv_arg1="const"
]
)
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
AC_MSG_RESULT([
$]{ac_t:-
}[$]
am_cv_proto_iconv)
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
AC_MSG_RESULT([
$
am_cv_proto_iconv
]
)
AC_DEFINE_UNQUOTED(
[
ICONV_CONST
]
,
[
$am_cv_proto_iconv_arg1
]
,
[Define as const if the declaration of iconv() needs const.])
fi
])
m4/intdiv0.m4
View file @
830fd6fc
# intdiv0.m4 serial
2
(gettext-0.1
7
)
dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc.
# intdiv0.m4 serial
3
(gettext-0.1
8
)
dnl Copyright (C) 2002, 2007
-2010
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.
...
...
@@ -61,7 +61,7 @@ int main ()
nan = y / y;
exit (1);
}
], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
],
[
gt_cv_int_divbyzero_sigfpe=yes
]
,
[
gt_cv_int_divbyzero_sigfpe=no
]
,
[
# Guess based on the CPU.
changequote(,)dnl
...
...
@@ -79,6 +79,6 @@ changequote([,])dnl
*yes) value=1;;
*) value=0;;
esac
AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
AC_DEFINE_UNQUOTED(
[
INTDIV0_RAISES_SIGFPE
]
,
[
$value
]
,
[Define if integer division by zero raises signal SIGFPE.])
])
m4/intl.m4
View file @
830fd6fc
# intl.m4 serial
8
(gettext-0.1
7
)
dnl Copyright (C) 1995-200
7
Free Software Foundation, Inc.
# intl.m4 serial
17
(gettext-0.1
8
)
dnl Copyright (C) 1995-200
9
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.
...
...
@@ -15,9 +15,9 @@ dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-200
6
.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-200
9
.
AC_PREREQ(2.52)
AC_PREREQ(
[
2.52
]
)
dnl Checks for all prerequisites of the intl subdirectory,
dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
...
...
@@ -40,14 +40,24 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([gt_PRINTF_POSIX])
AC_REQUIRE([gl_GLIBC21])dnl
AC_REQUIRE([gl_XSIZE])dnl
AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
AC_REQUIRE([gt_INTL_MACOSX])dnl
dnl Support for automake's --enable-silent-rules.
case "$enable_silent_rules" in
yes) INTL_DEFAULT_VERBOSITY=0;;
no) INTL_DEFAULT_VERBOSITY=1;;
*) INTL_DEFAULT_VERBOSITY=1;;
esac
AC_SUBST([INTL_DEFAULT_VERBOSITY])
AC_CHECK_TYPE([ptrdiff_t], ,
[AC_DEFINE([ptrdiff_t], [long],
[Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
])
AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
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).
...
...
@@ -78,6 +88,12 @@ AC_DEFUN([AM_INTL_SUBDIR],
HAVE_SNPRINTF=0
fi
AC_SUBST([HAVE_SNPRINTF])
if test "$ac_cv_func_newlocale" = yes; then
HAVE_NEWLOCALE=1
else
HAVE_NEWLOCALE=0
fi
AC_SUBST([HAVE_NEWLOCALE])
if test "$ac_cv_func_wprintf" = yes; then
HAVE_WPRINTF=1
else
...
...
@@ -146,22 +162,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
#define __libc_lock_lock_recursive gl_recursive_lock_lock
#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
#define glthread_in_use libintl_thread_in_use
#define glthread_lock_init libintl_lock_init
#define glthread_lock_lock libintl_lock_lock
#define glthread_lock_unlock libintl_lock_unlock
#define glthread_lock_destroy libintl_lock_destroy
#define glthread_rwlock_init libintl_rwlock_init
#define glthread_rwlock_rdlock libintl_rwlock_rdlock
#define glthread_rwlock_wrlock libintl_rwlock_wrlock