Test for gnulib modules 'snprintf-posix' and 'vsnprintf-posix'.

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 4b6fcb8..eadd98d 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-01-28 13:58:02 $'
+cvsdatestamp='$Date: 2007-03-06 03:38:30 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -93,6 +93,7 @@ Usage: gnulib-tool --list
        gnulib-tool --extract-autoconf-snippet module
        gnulib-tool --extract-automake-snippet module
        gnulib-tool --extract-include-directive module
+       gnulib-tool --extract-link-directive module
        gnulib-tool --extract-license module
        gnulib-tool --extract-maintainer module
        gnulib-tool --extract-tests-module module
@@ -117,6 +118,7 @@ Operation modes:
       --extract-autoconf-snippet   extract the snippet for configure.ac
       --extract-automake-snippet   extract the snippet for library makefile
       --extract-include-directive  extract the #include directive
+      --extract-link-directive     extract the linker directive
       --extract-license            report the license terms of the source files
                                    under lib/
       --extract-maintainer         report the maintainer(s) inside gnulib
@@ -888,9 +890,11 @@ sed_extract_prog=':[        ]*$/ {
     s/^Description:[    ]*$//
     s/^Files:[  ]*$//
     s/^Depends-on:[     ]*$//
+    s/^configure\.ac-early:[    ]*$//
     s/^configure\.ac:[  ]*$//
     s/^Makefile\.am:[   ]*$//
     s/^Include:[        ]*$//
+    s/^Link:[   ]*$//
     s/^License:[        ]*$//
     s/^Maintainer:[     ]*$//
     tb
@@ -936,6 +940,15 @@ func_get_dependencies ()
   sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
 }
 
+# func_get_autoconf_early_snippet module
+# Input:
+# - local_gnulib_dir  from --local-dir
+func_get_autoconf_early_snippet ()
+{
+  func_lookup_file "modules/$1"
+  sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file"
+}
+
 # func_get_autoconf_snippet module
 # Input:
 # - local_gnulib_dir  from --local-dir
@@ -995,12 +1008,17 @@ func_get_automake_snippet ()
       # If some .c file exists and is not used with AC_LIBOBJ - for example,
       # a .c file is preprocessed into another .c file for BUILT_SOURCES -,
       # automake will generate a useless dependency; this is harmless.
-      sed_extract_c_files='/\.c$/p'
-      extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"`
-      if test -n "$extra_files"; then
-        echo "EXTRA_lib_SOURCES +=" $extra_files
-        echo
-      fi
+      case "$1" in
+        relocatable-prog-wrapper) ;;
+        *)
+          sed_extract_c_files='/\.c$/p'
+          extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"`
+          if test -n "$extra_files"; then
+            echo "EXTRA_lib_SOURCES +=" $extra_files
+            echo
+          fi
+          ;;
+      esac
       ;;
   esac
 }
@@ -1015,6 +1033,15 @@ func_get_include_directive ()
   sed -e 's/^\(["<]\)/#include \1/'
 }
 
+# func_get_link_directive module
+# Input:
+# - local_gnulib_dir  from --local-dir
+func_get_link_directive ()
+{
+  func_lookup_file "modules/$1"
+  sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file"
+}
+
 # func_get_license module
 # Input:
 # - local_gnulib_dir  from --local-dir
@@ -2095,12 +2122,13 @@ func_import ()
     if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
       echo "  AC_REQUIRE([AC_GNU_SOURCE])"
     fi
-    if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
-      echo "  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
-    fi
-    if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
-      echo "  AC_REQUIRE([gl_LOCK_EARLY])"
-    fi
+    for module in $modules; do
+      func_verify_module
+      if test -n "$module"; then
+        func_get_autoconf_early_snippet "$module"
+      fi
+    done \
+      | sed -e '/^$/d;' -e 's/^/  /'
     echo "])"
     echo
     echo "# This macro should be invoked from $configure_ac, in the section"
@@ -2252,6 +2280,19 @@ func_import ()
   ) | sed -e '/^$/d' -e 's/^/  /'
   rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if
 
+  for module in $modules; do
+    func_get_link_directive "$module"
+  done \
+    | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/  /' > "$tmp"/link
+  if test `wc -l < "$tmp"/link` != 0; then
+    echo
+    echo "You may need to use the following Makefile variables when linking."
+    echo "Use them in <program>_LDADD when linking a program, or"
+    echo "in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library."
+    cat "$tmp"/link
+  fi
+  rm -f "$tmp"/link
+
   echo
   echo "Don't forget to"
   if test "$makefile_am" = Makefile.am; then
@@ -2453,14 +2494,13 @@ func_create_testdir ()
        echo "AC_GNU_SOURCE"
        echo
      fi
-     if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
-       echo "gl_USE_SYSTEM_EXTENSIONS"
-       echo
-     fi
-     if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
-       echo "gl_LOCK_EARLY"
-       echo
-     fi
+     for module in $modules; do
+       func_verify_module
+       if test -n "$module"; then
+         func_get_autoconf_early_snippet "$module"
+       fi
+     done \
+       | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
      if test "$libtool" = true; then
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
        echo "gl_cond_libtool=true"
@@ -2573,14 +2613,13 @@ func_create_testdir ()
      echo "AC_GNU_SOURCE"
      echo
    fi
-   if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
-     echo "gl_USE_SYSTEM_EXTENSIONS"
-     echo
-   fi
-   if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
-     echo "gl_LOCK_EARLY"
-     echo
-   fi
+   for module in $modules; do
+     func_verify_nontests_module
+     if test -n "$module"; then
+       func_get_autoconf_early_snippet "$module"
+     fi
+   done \
+     | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
    if test "$libtool" = true; then
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
      echo "gl_cond_libtool=true"
@@ -3056,6 +3095,16 @@ case $mode in
     done
     ;;
 
+  extract-link-directive )
+    for module
+    do
+      func_verify_module
+      if test -n "$module"; then
+        func_get_link_directive "$module"
+      fi
+    done
+    ;;
+
   extract-license )
     for module
     do