Refine the tar CVS URL.

[pspp] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 58365fd0ca4614769362b5e39dd5be13c7066b05..6bb26ca74a3b36a7402488356e1e9f0b44aef6b4 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-04 16:06:01 $'
+cvsdatestamp='$Date: 2006-08-10 15:05:20 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -899,6 +899,7 @@ func_emit_lib_Makefile_am ()
   echo "${libname}_${libext}_SOURCES ="
   echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
   echo "noinst_HEADERS ="
+  echo "pkgdata_DATA ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
@@ -977,6 +978,7 @@ func_emit_tests_Makefile_am ()
   echo "noinst_PROGRAMS ="
   echo "check_PROGRAMS ="
   echo "noinst_HEADERS ="
+  echo "pkgdata_DATA ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
@@ -1524,6 +1526,8 @@ func_import ()
     echo "# any checks for libraries, header files, types and library functions."
     echo "AC_DEFUN([${macro_prefix}_EARLY],"
     echo "["
+    echo "  m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
+    echo "  m4_pattern_allow([^gl_ES$])dnl a valid locale name"
     echo "  AC_REQUIRE([AC_PROG_RANLIB])"
     if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
       echo "  AC_REQUIRE([AC_GNU_SOURCE])"
@@ -1798,6 +1802,14 @@ func_create_testdir ()
      else
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
      fi
+     # Wrap the set of autoconf snippets into an autoconf macro that is then
+     # invoked. This is needed because autoconf does not support AC_REQUIRE
+     # at the top level:
+     #   error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro
+     # but we want the AC_REQUIRE to have its normal meaning (provide one
+     # expansion of the required macro before the current point, and only one
+     # expansion total).
+     echo "AC_DEFUN([gl_INIT], ["
      if test "$auxdir" != "build-aux"; then
        sed_replace_build_aux='
          :a
@@ -1826,6 +1838,8 @@ func_create_testdir ()
            | sed -e "$sed_replace_build_aux"
        fi
      done
+     echo "])"
+     echo "gl_INIT"
      echo
      # Usually tests/config.h will be a superset of config.h. Verify this by
      # "merging" config.h into tests/config.h; look out for gcc warnings.
@@ -1860,6 +1874,10 @@ func_create_testdir ()
    echo "AC_PROG_CC"
    echo "AC_PROG_INSTALL"
    echo "AC_PROG_MAKE_SET"
+   echo
+   echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
+   echo "m4_pattern_allow([^gl_ES$])dnl a valid locale name"
+   echo
    echo "AC_PROG_RANLIB"
    echo
    if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
@@ -1879,6 +1897,14 @@ func_create_testdir ()
    else
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
    fi
+   # Wrap the set of autoconf snippets into an autoconf macro that is then
+   # invoked. This is needed because autoconf does not support AC_REQUIRE
+   # at the top level:
+   #   error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro
+   # but we want the AC_REQUIRE to have its normal meaning (provide one
+   # expansion of the required macro before the current point, and only one
+   # expansion total).
+   echo "AC_DEFUN([gl_INIT], ["
    if test "$auxdir" != "build-aux"; then
      sed_replace_build_aux='
        :a
@@ -1897,6 +1923,8 @@ func_create_testdir ()
          | sed -e "$sed_replace_build_aux"
      fi
    done
+   echo "])"
+   echo "gl_INIT"
    echo
    if test -n "$subdirs_with_configure_ac"; then
      echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])"