gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36013 - in gnunet: . m4 po


From: gnunet
Subject: [GNUnet-SVN] r36013 - in gnunet: . m4 po
Date: Sat, 27 Jun 2015 21:50:10 +0200

Author: grothoff
Date: 2015-06-27 21:50:10 +0200 (Sat, 27 Jun 2015)
New Revision: 36013

Modified:
   gnunet/config.rpath
   gnunet/m4/ChangeLog
   gnunet/m4/gettext.m4
   gnunet/m4/iconv.m4
   gnunet/m4/lib-ld.m4
   gnunet/m4/lib-link.m4
   gnunet/m4/lib-prefix.m4
   gnunet/m4/nls.m4
   gnunet/m4/po.m4
   gnunet/m4/progtest.m4
   gnunet/po/Makefile.in.in
   gnunet/po/Makevars.template
   gnunet/po/POTFILES.in
   gnunet/po/Rules-quot
Log:
downgrade to gettext 0.18.3 for more sane availability

Modified: gnunet/config.rpath
===================================================================
--- gnunet/config.rpath 2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/config.rpath 2015-06-27 19:50:10 UTC (rev 36013)
@@ -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-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2013 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <address@hidden>, 1996
 #
@@ -367,8 +367,12 @@
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.[01]*)
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
     freebsd* | dragonfly*)
@@ -544,11 +548,13 @@
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
-  freebsd[23].*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
   freebsd* | dragonfly*)
-    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
     ;;
   gnu*)
     library_names_spec='$libname$shrext'

Modified: gnunet/m4/ChangeLog
===================================================================
--- gnunet/m4/ChangeLog 2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/ChangeLog 2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,3 +1,14 @@
+2015-06-27  gettextize  <address@hidden>
+
+       * gettext.m4: Upgrade to gettext-0.18.3.
+       * iconv.m4: Upgrade to gettext-0.18.3.
+       * lib-ld.m4: Upgrade to gettext-0.18.3.
+       * lib-link.m4: Upgrade to gettext-0.18.3.
+       * lib-prefix.m4: Upgrade to gettext-0.18.3.
+       * nls.m4: Upgrade to gettext-0.18.3.
+       * po.m4: Upgrade to gettext-0.18.3.
+       * progtest.m4: Upgrade to gettext-0.18.3.
+
 2015-05-18  gettextize  <address@hidden>
 
        * iconv.m4: Upgrade to gettext-0.19.3.

Modified: gnunet/m4/gettext.m4
===================================================================
--- gnunet/m4/gettext.m4        2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/gettext.m4        2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2013 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.

Modified: gnunet/m4/iconv.m4
===================================================================
--- gnunet/m4/iconv.m4  2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/iconv.m4  2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2013 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.

Modified: gnunet/m4/lib-ld.m4
===================================================================
--- gnunet/m4/lib-ld.m4 2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/lib-ld.m4 2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2013 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.

Modified: gnunet/m4/lib-link.m4
===================================================================
--- gnunet/m4/lib-link.m4       2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/lib-link.m4       2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2013 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.

Modified: gnunet/m4/lib-prefix.m4
===================================================================
--- gnunet/m4/lib-prefix.m4     2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/lib-prefix.m4     2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2013 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.

Modified: gnunet/m4/nls.m4
===================================================================
--- gnunet/m4/nls.m4    2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/nls.m4    2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

Modified: gnunet/m4/po.m4
===================================================================
--- gnunet/m4/po.m4     2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/po.m4     2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
-# po.m4 serial 22 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# po.m4 serial 21 (gettext-0.18.3)
+dnl Copyright (C) 1995-2013 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.
@@ -30,7 +30,7 @@
 
   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.19])
+  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.

Modified: gnunet/m4/progtest.m4
===================================================================
--- gnunet/m4/progtest.m4       2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/m4/progtest.m4       2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,5 +1,5 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2013 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.

Modified: gnunet/po/Makefile.in.in
===================================================================
--- gnunet/po/Makefile.in.in    2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/po/Makefile.in.in    2015-06-27 19:50:10 UTC (rev 36013)
@@ -8,8 +8,8 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.19
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.18.3
+GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -77,16 +77,6 @@
 
 CATALOGS = @CATALOGS@
 
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -153,25 +143,15 @@
 # heuristic whether some file in the top level directory mentions "GNU xyz".
 # If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-       package_gnu="$(PACKAGE_GNU)"; \
-       test -n "$$package_gnu" || { \
-         if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; 
then \
-                LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-                              -size -10000000c -exec grep 'GNU @PACKAGE@' \
-                              /dev/null '{}' ';' 2>/dev/null; \
-              else \
-                LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-              fi; \
-            } | grep -v 'libtool:' >/dev/null; then \
-            package_gnu=yes; \
-          else \
-            package_gnu=no; \
-          fi; \
-       }; \
-       if test "$$package_gnu" = "yes"; then \
-         package_prefix='GNU '; \
+       if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; 
then \
+              LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size 
-10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+            else \
+              LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+            fi; \
+          } | grep -v 'libtool:' >/dev/null; then \
+         package_gnu='GNU '; \
        else \
-         package_prefix=''; \
+         package_gnu=''; \
        fi; \
        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = 
'@'PACKAGE_BUGREPORT'@'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -191,7 +171,7 @@
              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) 
@XGETTEXT_EXTRA_OPTIONS@ \
              --files-from=$(srcdir)/POTFILES.in \
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
-             --package-name="address@hidden@" \
+             --package-name="address@hidden@" \
              --package-version='@VERSION@' \
              --msgid-bugs-address="$$msgid_bugs_address" \
            ;; \
@@ -219,10 +199,9 @@
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(POFILESDEPS)
+$(POFILES): $(srcdir)/$(DOMAIN).pot
        @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
        if test -f "$(srcdir)/$${lang}.po"; then \
-         test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
          test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
          echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} 
$${lang}.po $(DOMAIN).pot"; \
          cd $(srcdir) \
@@ -383,7 +362,7 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-       test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+       $(MAKE) update-po
        @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)

Modified: gnunet/po/Makevars.template
===================================================================
--- gnunet/po/Makevars.template 2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/po/Makevars.template 2015-06-27 19:50:10 UTC (rev 36013)
@@ -20,13 +20,6 @@
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU =
-
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -58,21 +51,3 @@
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/po/POTFILES.in       2015-06-27 19:50:10 UTC (rev 36013)
@@ -459,7 +459,6 @@
 src/include/gnunet_mq_lib.h
 src/include/gnunet_postgres_lib.h
 src/include/gnunet_time_lib.h
-src/nat/test_stun.h
 src/rps/rps-test_util.h
 src/scalarproduct/scalarproduct.h
 src/testbed/testbed_api.h

Modified: gnunet/po/Rules-quot
===================================================================
--- gnunet/po/Rules-quot        2015-06-27 19:45:14 UTC (rev 36012)
+++ gnunet/po/Rules-quot        2015-06-27 19:50:10 UTC (rev 36013)
@@ -1,4 +1,3 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed address@hidden address@hidden 
insert-header.sin Rules-quot
@@ -21,17 +20,7 @@
        ll=`echo $$lang | sed -e 's/@.*//'`; \
        LC_ALL=C; export LC_ALL; \
        cd $(srcdir); \
-       if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l 
$$lang -o - 2>/dev/null \
-          | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
-          { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-            '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
-              $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
-              ;; \
-            *) \
-              $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
-              ;; \
-            esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
-            ; then \
+       if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | 
$(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > 
$$tmpdir/$$lang.new.po; then \
          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
            rm -f $$tmpdir/$$lang.new.po; \
          else \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]