aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-09-23 13:13:18 +0000
committerChristian Grothoff <christian@grothoff.org>2013-09-23 13:13:18 +0000
commitd7575b6d9168273a406c3d7df6e3406c23aa05ef (patch)
treef62e953eb7b459938f490878b047b57c53b778cc
parent12bf18b6b642d01ca2292339475b853ed06aaaac (diff)
downloadgnunet-d7575b6d9168273a406c3d7df6e3406c23aa05ef.tar.gz
gnunet-d7575b6d9168273a406c3d7df6e3406c23aa05ef.zip
-update po.m4 to later version, update ltdl check
-rw-r--r--configure.ac4
-rw-r--r--m4/po.m429
2 files changed, 28 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 9a7ddecb7..055d55334 100644
--- a/configure.ac
+++ b/configure.ac
@@ -501,8 +501,10 @@ AC_ARG_WITH(ltdl,
501 AC_CHECK_HEADERS(ltdl.h, 501 AC_CHECK_HEADERS(ltdl.h,
502 AC_CHECK_LIB([ltdl], [lt_dlopenext], 502 AC_CHECK_LIB([ltdl], [lt_dlopenext],
503 ltdl=1))]) 503 ltdl=1))])
504if test "$ltdl" != 1 504if test x$ltdl = x1
505then 505then
506 AC_MSG_RESULT([libltdl found])
507else
506 AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev]) 508 AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev])
507fi 509fi
508# restore LIBS 510# restore LIBS
diff --git a/m4/po.m4 b/m4/po.m4
index 00133ef36..47f36a41a 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
1# po.m4 serial 13 (gettext-0.15) 1# po.m4 serial 17 (gettext-0.18)
2dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@ dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19 19
20AC_PREREQ(2.50) 20AC_PREREQ([2.50])
21 21
22dnl Checks for all prerequisites of the po subdirectory. 22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS], 23AC_DEFUN([AM_PO_SUBDIRS],
@@ -27,6 +27,10 @@ AC_DEFUN([AM_PO_SUBDIRS],
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl 28 AC_REQUIRE([AM_NLS])dnl
29 29
30 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 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
33
30 dnl Perform the following tests also if --disable-nls has been given, 34 dnl Perform the following tests also if --disable-nls has been given,
31 dnl because they are needed for "make dist" to work. 35 dnl because they are needed for "make dist" to work.
32 36
@@ -37,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
37 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && 41 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 42 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
39 :) 43 :)
40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 44 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
41 45
42 dnl Test whether it is GNU msgfmt >= 0.15. 46 dnl Test whether it is GNU msgfmt >= 0.15.
43changequote(,)dnl 47changequote(,)dnl
@@ -84,6 +88,10 @@ changequote([,])dnl
84 test -n "$localedir" || localedir='${datadir}/locale' 88 test -n "$localedir" || localedir='${datadir}/locale'
85 AC_SUBST([localedir]) 89 AC_SUBST([localedir])
86 90
91 dnl Support for AM_XGETTEXT_OPTION.
92 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
93 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
94
87 AC_CONFIG_COMMANDS([po-directories], [[ 95 AC_CONFIG_COMMANDS([po-directories], [[
88 for ac_file in $CONFIG_FILES; do 96 for ac_file in $CONFIG_FILES; do
89 # Support "outfile[:infile[:infile...]]" 97 # Support "outfile[:infile[:infile...]]"
@@ -426,3 +434,16 @@ EOF
426 fi 434 fi
427 mv "$ac_file.tmp" "$ac_file" 435 mv "$ac_file.tmp" "$ac_file"
428]) 436])
437
438dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
439AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
440[
441 XGETTEXT_EXTRA_OPTIONS=
442])
443
444dnl Registers an option to be passed to xgettext in the po subdirectory.
445AC_DEFUN([AM_XGETTEXT_OPTION],
446[
447 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
448 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
449])