diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 11:45:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 11:45:04 +0000 |
commit | cd0a6e382eafd7fd241a00a10527333d73985fca (patch) | |
tree | c725f4c788d4ccc65ccba9e37b7a9b4095b797e9 | |
parent | 1b4ccddc7946888fc0b66c58b1434e1814a43822 (diff) | |
download | gnunet-cd0a6e382eafd7fd241a00a10527333d73985fca.tar.gz gnunet-cd0a6e382eafd7fd241a00a10527333d73985fca.zip |
-updating gettext m4 macros
-rw-r--r-- | m4/gettext.m4 | 134 | ||||
-rw-r--r-- | m4/intl.m4 | 181 | ||||
-rw-r--r-- | m4/po.m4 | 38 |
3 files changed, 189 insertions, 164 deletions
diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 91c345e99..be247bf7b 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # gettext.m4 serial 59 (gettext-0.16.1) | 1 | # gettext.m4 serial 66 (gettext-0.18.2) |
2 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain. | |||
15 | 15 | ||
16 | dnl Authors: | 16 | dnl Authors: |
17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | 17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. | 18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. |
19 | 19 | ||
20 | dnl Macro to add for using GNU gettext. | 20 | dnl Macro to add for using GNU gettext. |
21 | 21 | ||
@@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is | |||
35 | dnl 'need-formatstring-macros', then GNU gettext implementations that don't | 35 | dnl 'need-formatstring-macros', then GNU gettext implementations that don't |
36 | dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. | 36 | dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. |
37 | dnl INTLDIR is used to find the intl libraries. If empty, | 37 | dnl INTLDIR is used to find the intl libraries. If empty, |
38 | dnl the value `$(top_builddir)/intl/' is used. | 38 | dnl the value '$(top_builddir)/intl/' is used. |
39 | dnl | 39 | dnl |
40 | dnl The result of the configuration is one of three cases: | 40 | dnl The result of the configuration is one of three cases: |
41 | dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled | 41 | dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled |
@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT], | |||
60 | ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , | 60 | ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , |
61 | [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT | 61 | [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT |
62 | ])])])])]) | 62 | ])])])])]) |
63 | ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], | ||
64 | [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) | ||
63 | ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , | 65 | ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , |
64 | [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT | 66 | [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT |
65 | ])])])]) | 67 | ])])])]) |
@@ -95,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], | |||
95 | AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) | 97 | AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
96 | ]) | 98 | ]) |
97 | 99 | ||
98 | dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. | 100 | dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. |
99 | gt_INTL_MACOSX | 101 | gt_INTL_MACOSX |
100 | 102 | ||
101 | dnl Set USE_NLS. | 103 | dnl Set USE_NLS. |
@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT], | |||
123 | gt_use_preinstalled_gnugettext=no | 125 | gt_use_preinstalled_gnugettext=no |
124 | ifelse(gt_included_intl, yes, [ | 126 | ifelse(gt_included_intl, yes, [ |
125 | AC_MSG_CHECKING([whether included gettext is requested]) | 127 | AC_MSG_CHECKING([whether included gettext is requested]) |
126 | AC_ARG_WITH(included-gettext, | 128 | AC_ARG_WITH([included-gettext], |
127 | [ --with-included-gettext use the GNU gettext library included here], | 129 | [ --with-included-gettext use the GNU gettext library included here], |
128 | nls_cv_force_use_gnu_gettext=$withval, | 130 | nls_cv_force_use_gnu_gettext=$withval, |
129 | nls_cv_force_use_gnu_gettext=no) | 131 | nls_cv_force_use_gnu_gettext=no) |
130 | AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) | 132 | AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) |
131 | 133 | ||
132 | nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" | 134 | nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" |
133 | if test "$nls_cv_force_use_gnu_gettext" != "yes"; then | 135 | if test "$nls_cv_force_use_gnu_gettext" != "yes"; then |
@@ -155,12 +157,18 @@ changequote([,])dnl | |||
155 | fi | 157 | fi |
156 | 158 | ||
157 | AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], | 159 | AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], |
158 | [AC_TRY_LINK([#include <libintl.h> | 160 | [AC_LINK_IFELSE( |
161 | [AC_LANG_PROGRAM( | ||
162 | [[ | ||
163 | #include <libintl.h> | ||
159 | $gt_revision_test_code | 164 | $gt_revision_test_code |
160 | extern int _nl_msg_cat_cntr; | 165 | extern int _nl_msg_cat_cntr; |
161 | extern int *_nl_domain_bindings;], | 166 | extern int *_nl_domain_bindings; |
162 | [bindtextdomain ("", ""); | 167 | ]], |
163 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], | 168 | [[ |
169 | bindtextdomain ("", ""); | ||
170 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings | ||
171 | ]])], | ||
164 | [eval "$gt_func_gnugettext_libc=yes"], | 172 | [eval "$gt_func_gnugettext_libc=yes"], |
165 | [eval "$gt_func_gnugettext_libc=no"])]) | 173 | [eval "$gt_func_gnugettext_libc=no"])]) |
166 | 174 | ||
@@ -181,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b | |||
181 | gt_save_LIBS="$LIBS" | 189 | gt_save_LIBS="$LIBS" |
182 | LIBS="$LIBS $LIBINTL" | 190 | LIBS="$LIBS $LIBINTL" |
183 | dnl Now see whether libintl exists and does not depend on libiconv. | 191 | dnl Now see whether libintl exists and does not depend on libiconv. |
184 | AC_TRY_LINK([#include <libintl.h> | 192 | AC_LINK_IFELSE( |
193 | [AC_LANG_PROGRAM( | ||
194 | [[ | ||
195 | #include <libintl.h> | ||
185 | $gt_revision_test_code | 196 | $gt_revision_test_code |
186 | extern int _nl_msg_cat_cntr; | 197 | extern int _nl_msg_cat_cntr; |
187 | extern | 198 | extern |
188 | #ifdef __cplusplus | 199 | #ifdef __cplusplus |
189 | "C" | 200 | "C" |
190 | #endif | 201 | #endif |
191 | const char *_nl_expand_alias (const char *);], | 202 | const char *_nl_expand_alias (const char *); |
192 | [bindtextdomain ("", ""); | 203 | ]], |
193 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], | 204 | [[ |
205 | bindtextdomain ("", ""); | ||
206 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | ||
207 | ]])], | ||
194 | [eval "$gt_func_gnugettext_libintl=yes"], | 208 | [eval "$gt_func_gnugettext_libintl=yes"], |
195 | [eval "$gt_func_gnugettext_libintl=no"]) | 209 | [eval "$gt_func_gnugettext_libintl=no"]) |
196 | dnl Now see whether libintl exists and depends on libiconv. | 210 | dnl Now see whether libintl exists and depends on libiconv. |
197 | if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then | 211 | if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then |
198 | LIBS="$LIBS $LIBICONV" | 212 | LIBS="$LIBS $LIBICONV" |
199 | AC_TRY_LINK([#include <libintl.h> | 213 | AC_LINK_IFELSE( |
214 | [AC_LANG_PROGRAM( | ||
215 | [[ | ||
216 | #include <libintl.h> | ||
200 | $gt_revision_test_code | 217 | $gt_revision_test_code |
201 | extern int _nl_msg_cat_cntr; | 218 | extern int _nl_msg_cat_cntr; |
202 | extern | 219 | extern |
203 | #ifdef __cplusplus | 220 | #ifdef __cplusplus |
204 | "C" | 221 | "C" |
205 | #endif | 222 | #endif |
206 | const char *_nl_expand_alias (const char *);], | 223 | const char *_nl_expand_alias (const char *); |
207 | [bindtextdomain ("", ""); | 224 | ]], |
208 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], | 225 | [[ |
209 | [LIBINTL="$LIBINTL $LIBICONV" | 226 | bindtextdomain ("", ""); |
210 | LTLIBINTL="$LTLIBINTL $LTLIBICONV" | 227 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
211 | eval "$gt_func_gnugettext_libintl=yes" | 228 | ]])], |
212 | ]) | 229 | [LIBINTL="$LIBINTL $LIBICONV" |
230 | LTLIBINTL="$LTLIBINTL $LTLIBICONV" | ||
231 | eval "$gt_func_gnugettext_libintl=yes" | ||
232 | ]) | ||
213 | fi | 233 | fi |
214 | CPPFLAGS="$gt_save_CPPFLAGS" | 234 | CPPFLAGS="$gt_save_CPPFLAGS" |
215 | LIBS="$gt_save_LIBS"]) | 235 | LIBS="$gt_save_LIBS"]) |
@@ -267,7 +287,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
267 | 287 | ||
268 | if test "$gt_use_preinstalled_gnugettext" = "yes" \ | 288 | if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
269 | || test "$nls_cv_use_gnu_gettext" = "yes"; then | 289 | || test "$nls_cv_use_gnu_gettext" = "yes"; then |
270 | AC_DEFINE(ENABLE_NLS, 1, | 290 | AC_DEFINE([ENABLE_NLS], [1], |
271 | [Define to 1 if translation of program messages to the user's native language | 291 | [Define to 1 if translation of program messages to the user's native language |
272 | is requested.]) | 292 | is requested.]) |
273 | else | 293 | else |
@@ -301,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
301 | fi | 321 | fi |
302 | 322 | ||
303 | dnl For backward compatibility. Some packages may be using this. | 323 | dnl For backward compatibility. Some packages may be using this. |
304 | AC_DEFINE(HAVE_GETTEXT, 1, | 324 | AC_DEFINE([HAVE_GETTEXT], [1], |
305 | [Define if the GNU gettext() function is already present or preinstalled.]) | 325 | [Define if the GNU gettext() function is already present or preinstalled.]) |
306 | AC_DEFINE(HAVE_DCGETTEXT, 1, | 326 | AC_DEFINE([HAVE_DCGETTEXT], [1], |
307 | [Define if the GNU dcgettext() function is already present or preinstalled.]) | 327 | [Define if the GNU dcgettext() function is already present or preinstalled.]) |
308 | fi | 328 | fi |
309 | 329 | ||
@@ -319,9 +339,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
319 | fi | 339 | fi |
320 | 340 | ||
321 | dnl Make all variables we use known to autoconf. | 341 | dnl Make all variables we use known to autoconf. |
322 | AC_SUBST(BUILD_INCLUDED_LIBINTL) | 342 | AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
323 | AC_SUBST(USE_INCLUDED_LIBINTL) | 343 | AC_SUBST([USE_INCLUDED_LIBINTL]) |
324 | AC_SUBST(CATOBJEXT) | 344 | AC_SUBST([CATOBJEXT]) |
325 | 345 | ||
326 | dnl For backward compatibility. Some configure.ins may be using this. | 346 | dnl For backward compatibility. Some configure.ins may be using this. |
327 | nls_cv_header_intl= | 347 | nls_cv_header_intl= |
@@ -329,74 +349,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
329 | 349 | ||
330 | dnl For backward compatibility. Some Makefiles may be using this. | 350 | dnl For backward compatibility. Some Makefiles may be using this. |
331 | DATADIRNAME=share | 351 | DATADIRNAME=share |
332 | AC_SUBST(DATADIRNAME) | 352 | AC_SUBST([DATADIRNAME]) |
333 | 353 | ||
334 | dnl For backward compatibility. Some Makefiles may be using this. | 354 | dnl For backward compatibility. Some Makefiles may be using this. |
335 | INSTOBJEXT=.mo | 355 | INSTOBJEXT=.mo |
336 | AC_SUBST(INSTOBJEXT) | 356 | AC_SUBST([INSTOBJEXT]) |
337 | 357 | ||
338 | dnl For backward compatibility. Some Makefiles may be using this. | 358 | dnl For backward compatibility. Some Makefiles may be using this. |
339 | GENCAT=gencat | 359 | GENCAT=gencat |
340 | AC_SUBST(GENCAT) | 360 | AC_SUBST([GENCAT]) |
341 | 361 | ||
342 | dnl For backward compatibility. Some Makefiles may be using this. | 362 | dnl For backward compatibility. Some Makefiles may be using this. |
343 | INTLOBJS= | 363 | INTLOBJS= |
344 | if test "$USE_INCLUDED_LIBINTL" = yes; then | 364 | if test "$USE_INCLUDED_LIBINTL" = yes; then |
345 | INTLOBJS="\$(GETTOBJS)" | 365 | INTLOBJS="\$(GETTOBJS)" |
346 | fi | 366 | fi |
347 | AC_SUBST(INTLOBJS) | 367 | AC_SUBST([INTLOBJS]) |
348 | 368 | ||
349 | dnl Enable libtool support if the surrounding package wishes it. | 369 | dnl Enable libtool support if the surrounding package wishes it. |
350 | INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix | 370 | INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
351 | AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) | 371 | AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
352 | ]) | 372 | ]) |
353 | 373 | ||
354 | dnl For backward compatibility. Some Makefiles may be using this. | 374 | dnl For backward compatibility. Some Makefiles may be using this. |
355 | INTLLIBS="$LIBINTL" | 375 | INTLLIBS="$LIBINTL" |
356 | AC_SUBST(INTLLIBS) | 376 | AC_SUBST([INTLLIBS]) |
357 | 377 | ||
358 | dnl Make all documented variables known to autoconf. | 378 | dnl Make all documented variables known to autoconf. |
359 | AC_SUBST(LIBINTL) | 379 | AC_SUBST([LIBINTL]) |
360 | AC_SUBST(LTLIBINTL) | 380 | AC_SUBST([LTLIBINTL]) |
361 | AC_SUBST(POSUB) | 381 | AC_SUBST([POSUB]) |
362 | ]) | ||
363 | |||
364 | |||
365 | dnl Checks for special options needed on MacOS X. | ||
366 | dnl Defines INTL_MACOSX_LIBS. | ||
367 | AC_DEFUN([gt_INTL_MACOSX], | ||
368 | [ | ||
369 | dnl Check for API introduced in MacOS X 10.2. | ||
370 | AC_CACHE_CHECK([for CFPreferencesCopyAppValue], | ||
371 | gt_cv_func_CFPreferencesCopyAppValue, | ||
372 | [gt_save_LIBS="$LIBS" | ||
373 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||
374 | AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], | ||
375 | [CFPreferencesCopyAppValue(NULL, NULL)], | ||
376 | [gt_cv_func_CFPreferencesCopyAppValue=yes], | ||
377 | [gt_cv_func_CFPreferencesCopyAppValue=no]) | ||
378 | LIBS="$gt_save_LIBS"]) | ||
379 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then | ||
380 | AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, | ||
381 | [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) | ||
382 | fi | ||
383 | dnl Check for API introduced in MacOS X 10.3. | ||
384 | AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, | ||
385 | [gt_save_LIBS="$LIBS" | ||
386 | LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" | ||
387 | AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], | ||
388 | [gt_cv_func_CFLocaleCopyCurrent=yes], | ||
389 | [gt_cv_func_CFLocaleCopyCurrent=no]) | ||
390 | LIBS="$gt_save_LIBS"]) | ||
391 | if test $gt_cv_func_CFLocaleCopyCurrent = yes; then | ||
392 | AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, | ||
393 | [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) | ||
394 | fi | ||
395 | INTL_MACOSX_LIBS= | ||
396 | if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then | ||
397 | INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" | ||
398 | fi | ||
399 | AC_SUBST([INTL_MACOSX_LIBS]) | ||
400 | ]) | 382 | ]) |
401 | 383 | ||
402 | 384 | ||
diff --git a/m4/intl.m4 b/m4/intl.m4 index dcefb118c..1747af909 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # intl.m4 serial 3 (gettext-0.16) | 1 | # intl.m4 serial 27 (gettext-0.19) |
2 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -15,9 +15,9 @@ dnl They are *not* in the public domain. | |||
15 | 15 | ||
16 | dnl Authors: | 16 | dnl Authors: |
17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | 17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. | 18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009. |
19 | 19 | ||
20 | AC_PREREQ(2.52) | 20 | AC_PREREQ([2.60]) |
21 | 21 | ||
22 | dnl Checks for all prerequisites of the intl subdirectory, | 22 | dnl Checks for all prerequisites of the intl subdirectory, |
23 | dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, | 23 | dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, |
@@ -25,7 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. | |||
25 | AC_DEFUN([AM_INTL_SUBDIR], | 25 | AC_DEFUN([AM_INTL_SUBDIR], |
26 | [ | 26 | [ |
27 | AC_REQUIRE([AC_PROG_INSTALL])dnl | 27 | AC_REQUIRE([AC_PROG_INSTALL])dnl |
28 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 28 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
29 | AC_REQUIRE([AC_PROG_CC])dnl | 29 | AC_REQUIRE([AC_PROG_CC])dnl |
30 | AC_REQUIRE([AC_CANONICAL_HOST])dnl | 30 | AC_REQUIRE([AC_CANONICAL_HOST])dnl |
31 | AC_REQUIRE([gt_GLIBC2])dnl | 31 | AC_REQUIRE([gt_GLIBC2])dnl |
@@ -33,7 +33,6 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
33 | AC_REQUIRE([gl_VISIBILITY])dnl | 33 | AC_REQUIRE([gl_VISIBILITY])dnl |
34 | AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl | 34 | AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl |
35 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl | 35 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl |
36 | AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl | ||
37 | AC_REQUIRE([gt_TYPE_WCHAR_T])dnl | 36 | AC_REQUIRE([gt_TYPE_WCHAR_T])dnl |
38 | AC_REQUIRE([gt_TYPE_WINT_T])dnl | 37 | AC_REQUIRE([gt_TYPE_WINT_T])dnl |
39 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | 38 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
@@ -41,26 +40,36 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
41 | AC_REQUIRE([gt_PRINTF_POSIX]) | 40 | AC_REQUIRE([gt_PRINTF_POSIX]) |
42 | AC_REQUIRE([gl_GLIBC21])dnl | 41 | AC_REQUIRE([gl_GLIBC21])dnl |
43 | AC_REQUIRE([gl_XSIZE])dnl | 42 | AC_REQUIRE([gl_XSIZE])dnl |
43 | AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl | ||
44 | AC_REQUIRE([gt_INTL_MACOSX])dnl | 44 | AC_REQUIRE([gt_INTL_MACOSX])dnl |
45 | AC_REQUIRE([gl_EXTERN_INLINE])dnl | ||
46 | AC_REQUIRE([gt_GL_ATTRIBUTE])dnl | ||
47 | |||
48 | dnl Support for automake's --enable-silent-rules. | ||
49 | case "$enable_silent_rules" in | ||
50 | yes) INTL_DEFAULT_VERBOSITY=0;; | ||
51 | no) INTL_DEFAULT_VERBOSITY=1;; | ||
52 | *) INTL_DEFAULT_VERBOSITY=1;; | ||
53 | esac | ||
54 | AC_SUBST([INTL_DEFAULT_VERBOSITY]) | ||
45 | 55 | ||
46 | AC_CHECK_TYPE([ptrdiff_t], , | 56 | AC_CHECK_TYPE([ptrdiff_t], , |
47 | [AC_DEFINE([ptrdiff_t], [long], | 57 | [AC_DEFINE([ptrdiff_t], [long], |
48 | [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) | 58 | [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) |
49 | ]) | 59 | ]) |
50 | AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) | 60 | AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h]) |
51 | AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) | 61 | AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \ |
62 | snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) | ||
52 | 63 | ||
53 | dnl Use the _snprintf function only if it is declared (because on NetBSD it | 64 | dnl Use the _snprintf function only if it is declared (because on NetBSD it |
54 | dnl is defined as a weak alias of snprintf; we prefer to use the latter). | 65 | dnl is defined as a weak alias of snprintf; we prefer to use the latter). |
55 | gt_CHECK_DECL(_snprintf, [#include <stdio.h>]) | 66 | AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>]) |
56 | gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) | ||
57 | 67 | ||
58 | dnl Use the *_unlocked functions only if they are declared. | 68 | dnl Use the *_unlocked functions only if they are declared. |
59 | dnl (because some of them were defined without being declared in Solaris | 69 | dnl (because some of them were defined without being declared in Solaris |
60 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | 70 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built |
61 | dnl on Solaris 2.5.1 to run on Solaris 2.6). | 71 | dnl on Solaris 2.5.1 to run on Solaris 2.6). |
62 | dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | 72 | AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>]) |
63 | gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) | ||
64 | 73 | ||
65 | case $gt_cv_func_printf_posix in | 74 | case $gt_cv_func_printf_posix in |
66 | *yes) HAVE_POSIX_PRINTF=1 ;; | 75 | *yes) HAVE_POSIX_PRINTF=1 ;; |
@@ -79,6 +88,12 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
79 | HAVE_SNPRINTF=0 | 88 | HAVE_SNPRINTF=0 |
80 | fi | 89 | fi |
81 | AC_SUBST([HAVE_SNPRINTF]) | 90 | AC_SUBST([HAVE_SNPRINTF]) |
91 | if test "$ac_cv_func_newlocale" = yes; then | ||
92 | HAVE_NEWLOCALE=1 | ||
93 | else | ||
94 | HAVE_NEWLOCALE=0 | ||
95 | fi | ||
96 | AC_SUBST([HAVE_NEWLOCALE]) | ||
82 | if test "$ac_cv_func_wprintf" = yes; then | 97 | if test "$ac_cv_func_wprintf" = yes; then |
83 | HAVE_WPRINTF=1 | 98 | HAVE_WPRINTF=1 |
84 | else | 99 | else |
@@ -98,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
98 | dnl exported variables _also_ in the static library. | 113 | dnl exported variables _also_ in the static library. |
99 | if test "$enable_shared" = yes; then | 114 | if test "$enable_shared" = yes; then |
100 | case "$host_os" in | 115 | case "$host_os" in |
101 | cygwin*) is_woe32dll=yes ;; | 116 | mingw* | cygwin*) is_woe32dll=yes ;; |
102 | *) is_woe32dll=no ;; | 117 | *) is_woe32dll=no ;; |
103 | esac | 118 | esac |
104 | else | 119 | else |
@@ -107,6 +122,31 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
107 | WOE32DLL=$is_woe32dll | 122 | WOE32DLL=$is_woe32dll |
108 | AC_SUBST([WOE32DLL]) | 123 | AC_SUBST([WOE32DLL]) |
109 | 124 | ||
125 | dnl On mingw and Cygwin, we can activate special Makefile rules which add | ||
126 | dnl version information to the shared libraries and executables. | ||
127 | case "$host_os" in | ||
128 | mingw* | cygwin*) is_woe32=yes ;; | ||
129 | *) is_woe32=no ;; | ||
130 | esac | ||
131 | WOE32=$is_woe32 | ||
132 | AC_SUBST([WOE32]) | ||
133 | if test $WOE32 = yes; then | ||
134 | dnl Check for a program that compiles Windows resource files. | ||
135 | AC_CHECK_TOOL([WINDRES], [windres]) | ||
136 | fi | ||
137 | |||
138 | dnl Determine whether when creating a library, "-lc" should be passed to | ||
139 | dnl libtool or not. On many platforms, it is required for the libtool option | ||
140 | dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool | ||
141 | dnl in the *.la files - makes it impossible to create multithreaded programs, | ||
142 | dnl because libtool also reorders the -lc to come before the -pthread, and | ||
143 | dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>. | ||
144 | case "$host_os" in | ||
145 | hpux*) LTLIBC="" ;; | ||
146 | *) LTLIBC="-lc" ;; | ||
147 | esac | ||
148 | AC_SUBST([LTLIBC]) | ||
149 | |||
110 | dnl Rename some macros and functions used for locking. | 150 | dnl Rename some macros and functions used for locking. |
111 | AH_BOTTOM([ | 151 | AH_BOTTOM([ |
112 | #define __libc_lock_t gl_lock_t | 152 | #define __libc_lock_t gl_lock_t |
@@ -122,22 +162,31 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
122 | #define __libc_lock_lock_recursive gl_recursive_lock_lock | 162 | #define __libc_lock_lock_recursive gl_recursive_lock_lock |
123 | #define __libc_lock_unlock_recursive gl_recursive_lock_unlock | 163 | #define __libc_lock_unlock_recursive gl_recursive_lock_unlock |
124 | #define glthread_in_use libintl_thread_in_use | 164 | #define glthread_in_use libintl_thread_in_use |
125 | #define glthread_lock_init libintl_lock_init | 165 | #define glthread_lock_init_func libintl_lock_init_func |
126 | #define glthread_lock_lock libintl_lock_lock | 166 | #define glthread_lock_lock_func libintl_lock_lock_func |
127 | #define glthread_lock_unlock libintl_lock_unlock | 167 | #define glthread_lock_unlock_func libintl_lock_unlock_func |
128 | #define glthread_lock_destroy libintl_lock_destroy | 168 | #define glthread_lock_destroy_func libintl_lock_destroy_func |
129 | #define glthread_rwlock_init libintl_rwlock_init | 169 | #define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded |
130 | #define glthread_rwlock_rdlock libintl_rwlock_rdlock | 170 | #define glthread_rwlock_init_func libintl_rwlock_init_func |
131 | #define glthread_rwlock_wrlock libintl_rwlock_wrlock | 171 | #define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded |
132 | #define glthread_rwlock_unlock libintl_rwlock_unlock | 172 | #define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func |
133 | #define glthread_rwlock_destroy libintl_rwlock_destroy | 173 | #define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded |
134 | #define glthread_recursive_lock_init libintl_recursive_lock_init | 174 | #define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func |
135 | #define glthread_recursive_lock_lock libintl_recursive_lock_lock | 175 | #define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded |
136 | #define glthread_recursive_lock_unlock libintl_recursive_lock_unlock | 176 | #define glthread_rwlock_unlock_func libintl_rwlock_unlock_func |
137 | #define glthread_recursive_lock_destroy libintl_recursive_lock_destroy | 177 | #define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded |
138 | #define glthread_once libintl_once | 178 | #define glthread_rwlock_destroy_func libintl_rwlock_destroy_func |
139 | #define glthread_once_call libintl_once_call | 179 | #define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded |
180 | #define glthread_recursive_lock_init_func libintl_recursive_lock_init_func | ||
181 | #define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded | ||
182 | #define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func | ||
183 | #define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded | ||
184 | #define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func | ||
185 | #define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded | ||
186 | #define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func | ||
187 | #define glthread_once_func libintl_once_func | ||
140 | #define glthread_once_singlethreaded libintl_once_singlethreaded | 188 | #define glthread_once_singlethreaded libintl_once_singlethreaded |
189 | #define glthread_once_multithreaded libintl_once_multithreaded | ||
141 | ]) | 190 | ]) |
142 | ]) | 191 | ]) |
143 | 192 | ||
@@ -171,45 +220,29 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], | |||
171 | AC_REQUIRE([gt_INTTYPES_PRI])dnl | 220 | AC_REQUIRE([gt_INTTYPES_PRI])dnl |
172 | AC_REQUIRE([gl_LOCK])dnl | 221 | AC_REQUIRE([gl_LOCK])dnl |
173 | 222 | ||
174 | AC_TRY_LINK( | 223 | AC_LINK_IFELSE( |
175 | [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], | 224 | [AC_LANG_PROGRAM( |
176 | [], | 225 | [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]], |
177 | [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, | 226 | [[]])], |
227 | [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1], | ||
178 | [Define to 1 if the compiler understands __builtin_expect.])]) | 228 | [Define to 1 if the compiler understands __builtin_expect.])]) |
179 | 229 | ||
180 | AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) | 230 | AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) |
181 | AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ | 231 | AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ |
182 | stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ | 232 | stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \ |
183 | argz_next __fsetlocking]) | 233 | argz_stringify argz_next __fsetlocking]) |
184 | 234 | ||
185 | dnl Use the *_unlocked functions only if they are declared. | 235 | dnl Use the *_unlocked functions only if they are declared. |
186 | dnl (because some of them were defined without being declared in Solaris | 236 | dnl (because some of them were defined without being declared in Solaris |
187 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built | 237 | dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built |
188 | dnl on Solaris 2.5.1 to run on Solaris 2.6). | 238 | dnl on Solaris 2.5.1 to run on Solaris 2.6). |
189 | dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. | 239 | AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>]) |
190 | gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) | ||
191 | gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) | ||
192 | 240 | ||
193 | AM_ICONV | 241 | AM_ICONV |
194 | 242 | ||
195 | dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, | ||
196 | dnl and a _NL_LOCALE_NAME macro always. | ||
197 | AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, | ||
198 | [AC_TRY_LINK([#include <langinfo.h> | ||
199 | #include <locale.h>], | ||
200 | [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], | ||
201 | gt_cv_nl_locale_name=yes, | ||
202 | gt_cv_nl_locale_name=no) | ||
203 | ]) | ||
204 | if test $gt_cv_nl_locale_name = yes; then | ||
205 | AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, | ||
206 | [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) | ||
207 | fi | ||
208 | |||
209 | dnl intl/plural.c is generated from intl/plural.y. It requires bison, | 243 | dnl intl/plural.c is generated from intl/plural.y. It requires bison, |
210 | dnl because plural.y uses bison specific features. It requires at least | 244 | dnl because plural.y uses bison specific features. It requires at least |
211 | dnl bison-1.26 because earlier versions generate a plural.c that doesn't | 245 | dnl bison-2.7 for %define api.pure. |
212 | dnl compile. | ||
213 | dnl bison is only needed for the maintainer (who touches plural.y). But in | 246 | dnl bison is only needed for the maintainer (who touches plural.y). But in |
214 | dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put | 247 | dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put |
215 | dnl the rule in general Makefile. Now, some people carelessly touch the | 248 | dnl the rule in general Makefile. Now, some people carelessly touch the |
@@ -226,7 +259,7 @@ changequote(<<,>>)dnl | |||
226 | ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` | 259 | ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` |
227 | case $ac_prog_version in | 260 | case $ac_prog_version in |
228 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | 261 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
229 | 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) | 262 | 2.[7-9]* | [3-9].*) |
230 | changequote([,])dnl | 263 | changequote([,])dnl |
231 | ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; | 264 | ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
232 | *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; | 265 | *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
@@ -238,22 +271,28 @@ changequote([,])dnl | |||
238 | fi | 271 | fi |
239 | ]) | 272 | ]) |
240 | 273 | ||
274 | dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from | ||
275 | dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib. | ||
276 | AC_DEFUN([gt_GL_ATTRIBUTE], [ | ||
277 | m4_ifndef([gl_[]COMMON], | ||
278 | AH_VERBATIM([gt_gl_attribute], | ||
279 | [/* Define as a marker that can be attached to declarations that might not | ||
280 | be used. This helps to reduce warnings, such as from | ||
281 | GCC -Wunused-parameter. */ | ||
282 | #ifndef _GL_UNUSED | ||
283 | # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) | ||
284 | # define _GL_UNUSED __attribute__ ((__unused__)) | ||
285 | # else | ||
286 | # define _GL_UNUSED | ||
287 | # endif | ||
288 | #endif | ||
241 | 289 | ||
242 | dnl gt_CHECK_DECL(FUNC, INCLUDES) | 290 | /* The __pure__ attribute was added in gcc 2.96. */ |
243 | dnl Check whether a function is declared. | 291 | #ifndef _GL_ATTRIBUTE_PURE |
244 | AC_DEFUN([gt_CHECK_DECL], | 292 | # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) |
245 | [ | 293 | # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) |
246 | AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, | 294 | # else |
247 | [AC_TRY_COMPILE([$2], [ | 295 | # define _GL_ATTRIBUTE_PURE /* empty */ |
248 | #ifndef $1 | 296 | # endif |
249 | char *p = (char *) $1; | ||
250 | #endif | 297 | #endif |
251 | ], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) | 298 | ]))]) |
252 | if test $ac_cv_have_decl_$1 = yes; then | ||
253 | gt_value=1 | ||
254 | else | ||
255 | gt_value=0 | ||
256 | fi | ||
257 | AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], | ||
258 | [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) | ||
259 | ]) | ||
@@ -1,5 +1,5 @@ | |||
1 | # po.m4 serial 17 (gettext-0.18) | 1 | # po.m4 serial 22 (gettext-0.19) |
2 | dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -17,19 +17,20 @@ dnl Authors: | |||
17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | 17 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | 18 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
19 | 19 | ||
20 | AC_PREREQ([2.50]) | 20 | AC_PREREQ([2.60]) |
21 | 21 | ||
22 | dnl Checks for all prerequisites of the po subdirectory. | 22 | dnl Checks for all prerequisites of the po subdirectory. |
23 | AC_DEFUN([AM_PO_SUBDIRS], | 23 | AC_DEFUN([AM_PO_SUBDIRS], |
24 | [ | 24 | [ |
25 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | 25 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
26 | AC_REQUIRE([AC_PROG_INSTALL])dnl | 26 | AC_REQUIRE([AC_PROG_INSTALL])dnl |
27 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 27 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
28 | AC_REQUIRE([AC_PROG_SED])dnl | ||
28 | AC_REQUIRE([AM_NLS])dnl | 29 | AC_REQUIRE([AM_NLS])dnl |
29 | 30 | ||
30 | dnl Release version of the gettext macros. This is used to ensure that | 31 | dnl Release version of the gettext macros. This is used to ensure that |
31 | dnl the gettext macros and po/Makefile.in.in are in sync. | 32 | dnl the gettext macros and po/Makefile.in.in are in sync. |
32 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) | 33 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) |
33 | 34 | ||
34 | dnl Perform the following tests also if --disable-nls has been given, | 35 | dnl Perform the following tests also if --disable-nls has been given, |
35 | dnl because they are needed for "make dist" to work. | 36 | dnl because they are needed for "make dist" to work. |
@@ -102,7 +103,7 @@ changequote([,])dnl | |||
102 | case "$ac_file" in */Makefile.in) | 103 | case "$ac_file" in */Makefile.in) |
103 | # Adjust a relative srcdir. | 104 | # Adjust a relative srcdir. |
104 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | 105 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
105 | ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | 106 | ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` |
106 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | 107 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
107 | # In autoconf-2.13 it is called $ac_given_srcdir. | 108 | # In autoconf-2.13 it is called $ac_given_srcdir. |
108 | # In autoconf-2.50 it is called $srcdir. | 109 | # In autoconf-2.50 it is called $srcdir. |
@@ -118,7 +119,8 @@ changequote([,])dnl | |||
118 | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then | 119 | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then |
119 | rm -f "$ac_dir/POTFILES" | 120 | rm -f "$ac_dir/POTFILES" |
120 | test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" | 121 | test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" |
121 | cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" | 122 | gt_tab=`printf '\t'` |
123 | cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" | ||
122 | POMAKEFILEDEPS="POTFILES.in" | 124 | POMAKEFILEDEPS="POTFILES.in" |
123 | # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend | 125 | # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend |
124 | # on $ac_dir but don't depend on user-specified configuration | 126 | # on $ac_dir but don't depend on user-specified configuration |
@@ -129,12 +131,12 @@ changequote([,])dnl | |||
129 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | 131 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
130 | fi | 132 | fi |
131 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | 133 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
132 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | 134 | # Hide the ALL_LINGUAS assignment from automake < 1.5. |
133 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | 135 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
134 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | 136 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
135 | else | 137 | else |
136 | # The set of available languages was given in configure.in. | 138 | # The set of available languages was given in configure.in. |
137 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | 139 | # Hide the ALL_LINGUAS assignment from automake < 1.5. |
138 | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' | 140 | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' |
139 | fi | 141 | fi |
140 | # Compute POFILES | 142 | # Compute POFILES |
@@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], | |||
226 | changequote(,)dnl | 228 | changequote(,)dnl |
227 | # Adjust a relative srcdir. | 229 | # Adjust a relative srcdir. |
228 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | 230 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
229 | ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | 231 | ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` |
230 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | 232 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
231 | # In autoconf-2.13 it is called $ac_given_srcdir. | 233 | # In autoconf-2.13 it is called $ac_given_srcdir. |
232 | # In autoconf-2.50 it is called $srcdir. | 234 | # In autoconf-2.50 it is called $srcdir. |
@@ -254,6 +256,7 @@ EOT | |||
254 | fi | 256 | fi |
255 | 257 | ||
256 | # A sed script that extracts the value of VARIABLE from a Makefile. | 258 | # A sed script that extracts the value of VARIABLE from a Makefile. |
259 | tab=`printf '\t'` | ||
257 | sed_x_variable=' | 260 | sed_x_variable=' |
258 | # Test if the hold space is empty. | 261 | # Test if the hold space is empty. |
259 | x | 262 | x |
@@ -261,9 +264,9 @@ s/P/P/ | |||
261 | x | 264 | x |
262 | ta | 265 | ta |
263 | # Yes it was empty. Look if we have the expected variable definition. | 266 | # Yes it was empty. Look if we have the expected variable definition. |
264 | /^[ ]*VARIABLE[ ]*=/{ | 267 | /^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ |
265 | # Seen the first line of the variable definition. | 268 | # Seen the first line of the variable definition. |
266 | s/^[ ]*VARIABLE[ ]*=// | 269 | s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// |
267 | ba | 270 | ba |
268 | } | 271 | } |
269 | bd | 272 | bd |
@@ -315,7 +318,7 @@ changequote([,])dnl | |||
315 | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` | 318 | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` |
316 | ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` | 319 | ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` |
317 | fi | 320 | fi |
318 | # Hide the ALL_LINGUAS assigment from automake < 1.5. | 321 | # Hide the ALL_LINGUAS assignment from automake < 1.5. |
319 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | 322 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
320 | # Compute POFILES | 323 | # Compute POFILES |
321 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | 324 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
@@ -405,14 +408,15 @@ changequote([,])dnl | |||
405 | fi | 408 | fi |
406 | 409 | ||
407 | 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|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" | 410 | 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|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" |
411 | tab=`printf '\t'` | ||
408 | if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then | 412 | if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then |
409 | # Add dependencies that cannot be formulated as a simple suffix rule. | 413 | # Add dependencies that cannot be formulated as a simple suffix rule. |
410 | for lang in $ALL_LINGUAS; do | 414 | for lang in $ALL_LINGUAS; do |
411 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | 415 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
412 | cat >> "$ac_file.tmp" <<EOF | 416 | cat >> "$ac_file.tmp" <<EOF |
413 | $frobbedlang.msg: $lang.po | 417 | $frobbedlang.msg: $lang.po |
414 | @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ | 418 | ${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ |
415 | \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | 419 | ${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
416 | EOF | 420 | EOF |
417 | done | 421 | done |
418 | fi | 422 | fi |
@@ -422,8 +426,8 @@ EOF | |||
422 | frobbedlang=`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/'` | 426 | frobbedlang=`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/'` |
423 | cat >> "$ac_file.tmp" <<EOF | 427 | cat >> "$ac_file.tmp" <<EOF |
424 | $frobbedlang/\$(DOMAIN).resources.dll: $lang.po | 428 | $frobbedlang/\$(DOMAIN).resources.dll: $lang.po |
425 | @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ | 429 | ${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ |
426 | \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | 430 | ${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
427 | EOF | 431 | EOF |
428 | done | 432 | done |
429 | fi | 433 | fi |