diff options
Diffstat (limited to 'gl/m4/gettext.m4')
-rw-r--r-- | gl/m4/gettext.m4 | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gl/m4/gettext.m4 b/gl/m4/gettext.m4 index c9ae1f7..d90c850 100644 --- a/gl/m4/gettext.m4 +++ b/gl/m4/gettext.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # gettext.m4 serial 60 (gettext-0.17) | 1 | # gettext.m4 serial 62 (gettext-0.18) |
2 | dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2009 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. |
@@ -123,11 +123,11 @@ AC_DEFUN([AM_GNU_GETTEXT], | |||
123 | gt_use_preinstalled_gnugettext=no | 123 | gt_use_preinstalled_gnugettext=no |
124 | ifelse(gt_included_intl, yes, [ | 124 | ifelse(gt_included_intl, yes, [ |
125 | AC_MSG_CHECKING([whether included gettext is requested]) | 125 | AC_MSG_CHECKING([whether included gettext is requested]) |
126 | AC_ARG_WITH(included-gettext, | 126 | AC_ARG_WITH([included-gettext], |
127 | [ --with-included-gettext use the GNU gettext library included here], | 127 | [ --with-included-gettext use the GNU gettext library included here], |
128 | nls_cv_force_use_gnu_gettext=$withval, | 128 | nls_cv_force_use_gnu_gettext=$withval, |
129 | nls_cv_force_use_gnu_gettext=no) | 129 | nls_cv_force_use_gnu_gettext=no) |
130 | AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) | 130 | AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) |
131 | 131 | ||
132 | nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" | 132 | nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" |
133 | if test "$nls_cv_force_use_gnu_gettext" != "yes"; then | 133 | if test "$nls_cv_force_use_gnu_gettext" != "yes"; then |
@@ -267,7 +267,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
267 | 267 | ||
268 | if test "$gt_use_preinstalled_gnugettext" = "yes" \ | 268 | if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
269 | || test "$nls_cv_use_gnu_gettext" = "yes"; then | 269 | || test "$nls_cv_use_gnu_gettext" = "yes"; then |
270 | AC_DEFINE(ENABLE_NLS, 1, | 270 | AC_DEFINE([ENABLE_NLS], [1], |
271 | [Define to 1 if translation of program messages to the user's native language | 271 | [Define to 1 if translation of program messages to the user's native language |
272 | is requested.]) | 272 | is requested.]) |
273 | else | 273 | else |
@@ -301,9 +301,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
301 | fi | 301 | fi |
302 | 302 | ||
303 | dnl For backward compatibility. Some packages may be using this. | 303 | dnl For backward compatibility. Some packages may be using this. |
304 | AC_DEFINE(HAVE_GETTEXT, 1, | 304 | AC_DEFINE([HAVE_GETTEXT], [1], |
305 | [Define if the GNU gettext() function is already present or preinstalled.]) | 305 | [Define if the GNU gettext() function is already present or preinstalled.]) |
306 | AC_DEFINE(HAVE_DCGETTEXT, 1, | 306 | AC_DEFINE([HAVE_DCGETTEXT], [1], |
307 | [Define if the GNU dcgettext() function is already present or preinstalled.]) | 307 | [Define if the GNU dcgettext() function is already present or preinstalled.]) |
308 | fi | 308 | fi |
309 | 309 | ||
@@ -319,9 +319,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
319 | fi | 319 | fi |
320 | 320 | ||
321 | dnl Make all variables we use known to autoconf. | 321 | dnl Make all variables we use known to autoconf. |
322 | AC_SUBST(BUILD_INCLUDED_LIBINTL) | 322 | AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
323 | AC_SUBST(USE_INCLUDED_LIBINTL) | 323 | AC_SUBST([USE_INCLUDED_LIBINTL]) |
324 | AC_SUBST(CATOBJEXT) | 324 | AC_SUBST([CATOBJEXT]) |
325 | 325 | ||
326 | dnl For backward compatibility. Some configure.ins may be using this. | 326 | dnl For backward compatibility. Some configure.ins may be using this. |
327 | nls_cv_header_intl= | 327 | nls_cv_header_intl= |
@@ -329,36 +329,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | |||
329 | 329 | ||
330 | dnl For backward compatibility. Some Makefiles may be using this. | 330 | dnl For backward compatibility. Some Makefiles may be using this. |
331 | DATADIRNAME=share | 331 | DATADIRNAME=share |
332 | AC_SUBST(DATADIRNAME) | 332 | AC_SUBST([DATADIRNAME]) |
333 | 333 | ||
334 | dnl For backward compatibility. Some Makefiles may be using this. | 334 | dnl For backward compatibility. Some Makefiles may be using this. |
335 | INSTOBJEXT=.mo | 335 | INSTOBJEXT=.mo |
336 | AC_SUBST(INSTOBJEXT) | 336 | AC_SUBST([INSTOBJEXT]) |
337 | 337 | ||
338 | dnl For backward compatibility. Some Makefiles may be using this. | 338 | dnl For backward compatibility. Some Makefiles may be using this. |
339 | GENCAT=gencat | 339 | GENCAT=gencat |
340 | AC_SUBST(GENCAT) | 340 | AC_SUBST([GENCAT]) |
341 | 341 | ||
342 | dnl For backward compatibility. Some Makefiles may be using this. | 342 | dnl For backward compatibility. Some Makefiles may be using this. |
343 | INTLOBJS= | 343 | INTLOBJS= |
344 | if test "$USE_INCLUDED_LIBINTL" = yes; then | 344 | if test "$USE_INCLUDED_LIBINTL" = yes; then |
345 | INTLOBJS="\$(GETTOBJS)" | 345 | INTLOBJS="\$(GETTOBJS)" |
346 | fi | 346 | fi |
347 | AC_SUBST(INTLOBJS) | 347 | AC_SUBST([INTLOBJS]) |
348 | 348 | ||
349 | dnl Enable libtool support if the surrounding package wishes it. | 349 | dnl Enable libtool support if the surrounding package wishes it. |
350 | INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix | 350 | INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
351 | AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) | 351 | AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
352 | ]) | 352 | ]) |
353 | 353 | ||
354 | dnl For backward compatibility. Some Makefiles may be using this. | 354 | dnl For backward compatibility. Some Makefiles may be using this. |
355 | INTLLIBS="$LIBINTL" | 355 | INTLLIBS="$LIBINTL" |
356 | AC_SUBST(INTLLIBS) | 356 | AC_SUBST([INTLLIBS]) |
357 | 357 | ||
358 | dnl Make all documented variables known to autoconf. | 358 | dnl Make all documented variables known to autoconf. |
359 | AC_SUBST(LIBINTL) | 359 | AC_SUBST([LIBINTL]) |
360 | AC_SUBST(LTLIBINTL) | 360 | AC_SUBST([LTLIBINTL]) |
361 | AC_SUBST(POSUB) | 361 | AC_SUBST([POSUB]) |
362 | ]) | 362 | ]) |
363 | 363 | ||
364 | 364 | ||