[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29495 - in gnunet: . m4
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29495 - in gnunet: . m4 |
Date: |
Mon, 23 Sep 2013 15:13:18 +0200 |
Author: grothoff
Date: 2013-09-23 15:13:18 +0200 (Mon, 23 Sep 2013)
New Revision: 29495
Modified:
gnunet/configure.ac
gnunet/m4/po.m4
Log:
-update po.m4 to later version, update ltdl check
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-09-23 13:12:34 UTC (rev 29494)
+++ gnunet/configure.ac 2013-09-23 13:13:18 UTC (rev 29495)
@@ -501,8 +501,10 @@
AC_CHECK_HEADERS(ltdl.h,
AC_CHECK_LIB([ltdl], [lt_dlopenext],
ltdl=1))])
-if test "$ltdl" != 1
+if test x$ltdl = x1
then
+ AC_MSG_RESULT([libltdl found])
+else
AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing
libltdl-dev])
fi
# restore LIBS
Modified: gnunet/m4/po.m4
===================================================================
--- gnunet/m4/po.m4 2013-09-23 13:12:34 UTC (rev 29494)
+++ gnunet/m4/po.m4 2013-09-23 13:13:18 UTC (rev 29495)
@@ -1,5 +1,5 @@
-# po.m4 serial 13 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-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.
@@ -17,7 +17,7 @@
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2003.
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
dnl Checks for all prerequisites of the po subdirectory.
AC_DEFUN([AM_PO_SUBDIRS],
@@ -27,6 +27,10 @@
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
AC_REQUIRE([AM_NLS])dnl
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
@@ -37,7 +41,7 @@
[$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
dnl Test whether it is GNU msgfmt >= 0.15.
changequote(,)dnl
@@ -84,6 +88,10 @@
test -n "$localedir" || localedir='${datadir}/locale'
AC_SUBST([localedir])
+ dnl Support for AM_XGETTEXT_OPTION.
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
AC_CONFIG_COMMANDS([po-directories], [[
for ac_file in $CONFIG_FILES; do
# Support "outfile[:infile[:infile...]]"
@@ -426,3 +434,16 @@
fi
mv "$ac_file.tmp" "$ac_file"
])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+ XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29495 - in gnunet: . m4,
gnunet <=