X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=7cab3ef1de6dd5b86d63dcdaefa25293a184c514;hb=d162e5500ad357804530b775f10650e454a6bf3a;hp=71b5908655ba6791c03747cc82675cca884981e1;hpb=20b48cd73a7fff60f967333f2aff8e2854171768;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index 71b590865..7cab3ef1d 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
 # This program is meant for authors or maintainers which want to import
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-01-05 02:50:04 $'
+cvsdatestamp='$Date: 2005-08-11 10:08:57 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -88,11 +88,17 @@ Options:
                             placed (default \"lib\"), for --import.
       --m4-base=DIRECTORY   Directory relative --dir where *.m4 macros are
                             placed (default \"m4\"), for --import.
+      --aux-dir=DIRECTORY   Directory relative --dir where auxiliary build
+                            tools are placed (default \".\"), for --import.
+      --avoid=MODULE        Avoid including the given MODULE. Useful if you
+                            have code that provides equivalent functionality.
+                            This option can be repeated.
       --lgpl                Abort if modules aren't available under the LGPL.
                             Also modify license template from GPL to LGPL.
       --libtool             Use libtool rules, for --import.
       --no-changelog        don't update or create ChangeLog files
       --dry-run             For --import, only print what would have been done.
+  -s, --symbolic, --symlink Make symbolic links instead of copying files.
 
 Report bugs to <bug-gnulib@gnu.org>."
 }
@@ -117,6 +123,59 @@ func_fatal_error ()
   exit 1
 }
 
+# func_cp_if_changed SRC DEST
+# Like cp, but avoids munging timestamps if the file hasn't changed.
+# Uses also the variables
+# - dry_run         true if actions shall only be printed, blank otherwise
+func_cp_if_changed ()
+{
+  if test $# -ne 2; then
+    echo "usage: func_cp_if_changed SRC DEST" >&2
+  fi
+  test -n "$dry_run" && dry=echo
+  if cmp "$1" "$2" >/dev/null 2>&1; then
+    :
+  else
+    $dry cp -p "$1" "$2"
+  fi
+}
+
+# func_mv_if_changed SRC DEST
+# Like mv, but avoids munging timestamps if the file hasn't changed.
+# Removes SRC if it is not renamed.
+# Uses also the variables
+# - dry_run         true if actions shall only be printed, blank otherwise
+func_mv_if_changed ()
+{
+  if test $# -ne 2; then
+    echo "usage: func_mv_if_changed SRC DEST" >&2
+  fi
+  test -n "$dry_run" && dry=echo
+  if cmp "$1" "$2" >/dev/null 2>&1; then
+    $dry rm "$1"
+  else
+    $dry mv "$1" "$2"
+  fi
+}
+
+# func_ln_if_changed SRC DEST
+# Like ln -s, but avoids munging timestamps if the link is correct.
+# Uses also the variables
+# - dry_run         true if actions shall only be printed, blank otherwise
+func_ln_if_changed ()
+{
+  if test $# -ne 2; then
+    echo "usage: func_ln_if_changed SRC DEST" >&2
+  fi
+  test -n "$dry_run" && dry=echo
+  if test -L "$2" -a "$1" = "`readlink "$2"`"; then
+    :
+  else
+    $dry rm -f "$2"
+    $dry ln -s "$1" "$2"
+  fi
+}
+
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - mode            list or import or create-testdir or create-megatestdir
@@ -124,8 +183,10 @@ func_fatal_error ()
 # - libname, supplied_libname  from --lib
 # - sourcebase      from --source-base
 # - m4base          from --m4-base
-# - libtool         true if --libtool was given, blank otherwise
+# - auxdir          from --aux-dir
+# - avoidlist       list of modules to avoid, from --avoid
 # - lgpl            true if --lgpl was given, blank otherwise
+# - libtool         true if --libtool was given, blank otherwise
 # - do_changelog    false if --no-changelog was given, : otherwise
 # - dry_run         true if --dry-run was given, blank otherwise
 {
@@ -135,11 +196,13 @@ func_fatal_error ()
   supplied_libname=
   sourcebase=
   m4base=
-  libtool=
+  auxdir=
+  avoidlist=
   lgpl=
+  libtool=
   do_changelog=:
   dry_run=
-  lgpl=
+  symbolic=
 
   supplied_opts="$@"
 
@@ -208,18 +271,41 @@ func_fatal_error ()
       --m4-base=* )
         m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'`
         shift ;;
-      --libtool )
-        libtool=true
+      --aux-dir )
+        shift
+        if test $# = 0; then
+          func_fatal_error "missing argument for --aux-dir"
+        fi
+        auxdir=$1
+        shift ;;
+      --aux-dir=* )
+        auxdir=`echo "X$1" | sed -e 's/^X--aux-dir=//'`
+        shift ;;
+      --avoid )
+        shift
+        if test $# = 0; then
+          func_fatal_error "missing argument for --avoid"
+        fi
+        avoidlist="$avoidlist $1"
+        shift ;;
+      --avoid=* )
+        avoidlist="$avoidlist "`echo "X$1" | sed -e 's/^X--avoid=//'`
         shift ;;
       --lgpl )
         lgpl=true
         shift ;;
+      --libtool )
+        libtool=true
+        shift ;;
       --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c )
         do_changelog=false
         shift ;;
       --dry-run )
         dry_run=true
         shift ;;
+      -s | --symbolic | --symlink )
+        symbolic=true
+        shift ;;
       --help | --hel | --he | --h )
         func_usage
         exit 0 ;;
@@ -357,9 +443,24 @@ func_get_maintainer ()
   sed -n -e "/^Maintainer$sed_extract_prog" < "$gnulib_dir/modules/$1"
 }
 
+# func_acceptable module
+# tests whether a module is acceptable.
+# Input:
+# - avoidlist       list of modules to avoid
+func_acceptable ()
+{
+  for avoid in $avoidlist; do
+    if test "$avoid" = "$1"; then
+      return 1
+    fi
+  done
+  return 0
+}
+
 # func_modules_transitive_closure
 # Input:
 # - modules         list of specified modules
+# - avoidlist       list of modules to avoid
 # Output:
 # - modules         list of modules, including dependencies
 func_modules_transitive_closure ()
@@ -369,12 +470,19 @@ func_modules_transitive_closure ()
     for module in $modules; do
       func_verify_module
       if test -n "$module"; then
-        # Duplicate dependenies are harmless, but Jim wants a warning.
+        # Duplicate dependencies are harmless, but Jim wants a warning.
         duplicated_deps=`func_get_dependencies $module | sort | uniq -d`
         if test -n "$duplicated_deps"; then
           echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
         fi
-        xmodules="$xmodules $module "`func_get_dependencies $module`
+        if func_acceptable $module; then
+          xmodules="$xmodules $module"
+          for depmodule in `func_get_dependencies $module`; do
+            if func_acceptable $depmodule; then
+              xmodules="$xmodules $depmodule"
+            fi
+          done
+        fi
       fi
     done
     xmodules=`for m in $xmodules; do echo $m; done | sort | uniq`
@@ -482,9 +590,11 @@ func_emit_lib_Makefile_am ()
 # - libname         library name
 # - sourcebase      directory relative to destdir where to place source code
 # - m4base          directory relative to destdir where to place *.m4 macros
-# - libtool         true if libtool will be used, blank otherwise
+# - avoidlist       list of modules to avoid, from --avoid
 # - lgpl            true if library's license shall be LGPL, blank otherwise
+# - libtool         true if libtool will be used, blank otherwise
 # - dry_run         true if actions shall only be printed, blank otherwise
+# - symbolic        true if files should be symlinked, copied otherwise
 # - supplied_opts   all options passed to gnulib-tool
 func_import ()
 {
@@ -500,9 +610,12 @@ func_import ()
   if test -n "$lgpl"; then
     for module in $modules; do
       license=`func_get_license $module`
-      if test $license != LGPL; then
-        func_fatal_error "incompatible license on module \`$module\`: $license"
-      fi
+      case $license in
+	LGPL | 'public domain') ;;
+	*)
+	  func_fatal_error \
+	    "incompatible license on module \`$module\`: $license" ;;
+      esac
     done
   fi
 
@@ -514,17 +627,20 @@ func_import ()
   test -n "$files" \
     || func_fatal_error "refusing to do nothing"
 
-  # Copy files.
+  # Copy files or make symbolic links.
   for f in $files; do
     source=
     case "$f" in
-      config/*) g=`echo "$f" | sed -e 's,^config/,,'` ;;
+      build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
       lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"`; source=true ;;
       m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
       *) g="$f" ;;
     esac
-    test -n "$dry_run" && dry=echo
-    $dry cp -p "$gnulib_dir/$f" "$destdir/$g"
+    if test -z "$symbolic"; then
+      func_cp_if_changed "$gnulib_dir/$f" "$destdir/$g"
+    else
+      func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+    fi
     # Update license.
     if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
       perl -pi -e 's/GNU General/GNU Lesser General/g;' \
@@ -543,21 +659,23 @@ func_import ()
   if test -n "$lgpl"; then
     opt_lgpl="--lgpl"
   fi
-  actioncmd="gnulib-tool --import --dir=$destdir --lib=$libname --source-base=$sourcebase --m4-base=$m4base $opt_libtool $opt_lgpl `echo $modules`"
+  actioncmd="gnulib-tool --import --dir=$destdir --lib=$libname --source-base=$sourcebase --m4-base=$m4base --aux-dir=$auxdir $opt_libtool $opt_lgpl `echo $modules`"
 
   # Create lib/Makefile.am.
   echo "Creating $destdir/$sourcebase/Makefile.am..."
   if test -z "$dry_run"; then
-    func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am
+    func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am.new
   else
     func_emit_lib_Makefile_am
   fi
+  func_mv_if_changed $destdir/$sourcebase/Makefile.am.new \
+                     $destdir/$sourcebase/Makefile.am
 
   # Create gnulib.m4.
   echo "Creating $destdir/$m4base/gnulib.m4..."
   (
     if test -z "$dry_run"; then
-      exec > $destdir/$m4base/gnulib.m4
+      exec > $destdir/$m4base/gnulib.m4.new
     else
       echo "# $destdir/$m4base/gnulib.m4"
     fi
@@ -602,6 +720,9 @@ func_import ()
     echo "dnl Usage: gl_MODULES(module1 module2 ...)"
     echo "AC_DEFUN([gl_MODULES], [])"
     echo
+    echo "dnl Usage: gl_AVOID(module1 module2 ...)"
+    echo "AC_DEFUN([gl_AVOID], [])"
+    echo
     echo "dnl Usage: gl_SOURCE_BASE(DIR)"
     echo "AC_DEFUN([gl_SOURCE_BASE], [])"
     echo
@@ -616,12 +737,13 @@ func_import ()
     echo
     echo "# gnulib.m4 ends here"
   )
+  func_mv_if_changed $destdir/$m4base/gnulib.m4.new $destdir/$m4base/gnulib.m4
   echo "Finished."
   echo
   echo "You may need to add #include directives for the following .h files."
   for module in $modules; do
-    func_get_include_directive "$module" | sed -e '/^$/d;' -e 's/^/  /'
-  done
+    func_get_include_directive "$module"
+  done | LC_ALL=C sort -u | sed -e '/^$/d;' -e 's/^/  /'
   echo
   echo "Don't forget to add \"$sourcebase/Makefile\""
   echo "to AC_CONFIG_FILES in \"$configure_ac\" and to mention"
@@ -647,19 +769,25 @@ func_create_testdir ()
 
   # Create directories.
   for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do
-    if test "$d" != config; then
+    if test "$d" = build-aux; then
+      mkdir -p "$testdir/$auxdir"
+    else
       mkdir -p "$testdir/$d"
     fi
   done
 
-  # Copy files.
+  # Copy files or make symbolic links.
   for f in $files; do
     case "$f" in
-      config/*) g=`echo "$f" | sed -e 's,^config/,,'` ;;
+      build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
       *) g="$f" ;;
     esac
     ln "$gnulib_dir/$f" "$testdir/$g" 2>/dev/null ||
-    cp -p "$gnulib_dir/$f" "$testdir/$g"
+    if test -z "$symbolic"; then
+      cp -p "$gnulib_dir/$f" "$testdir/$g"
+    else
+      ln -s "$gnulib_dir/$f" "$testdir/$g"
+    fi
   done
 
   # Create lib/Makefile.am.
@@ -827,6 +955,9 @@ case $mode in
       /gl_MODULES[^_]/  {
         s,^.*gl_MODULES([[   ]*\([^])]*\).*$,ac_modules="\1",; p;
       };
+      /gl_AVOID[^_]/  {
+        s,^.*gl_AVOID([[   ]*\([^])]*\).*$,ac_avoidlist="\1",; p;
+      };
       /gl_SOURCE_BASE/   {
         s,^.*gl_SOURCE_BASE([[         ]*\([^])]*\).*$,ac_sourcebase="\1",; p;
       };
@@ -836,6 +967,9 @@ case $mode in
       /gl_LIB/   {
         s,^.*gl_LIB([[         ]*\([^])]*\).*$,ac_libname="\1",; p;
       };
+      /AC_CONFIG_AUX_DIR/  {
+        s,^.*AC_CONFIG_AUX_DIR([[         ]*\([^])]*\).*$,ac_auxdir="\1",; p;
+      }
       /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
       /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
       /gl_LGPL/            { s,^.*$,lgpl=true,; p; };
@@ -861,6 +995,13 @@ case $mode in
       || (test -z "$dry_run" && mkdir "$destdir/$m4base") \
       || func_fatal_error "m4 base $destdir/$m4base doesn't exist"
 
+    # Set up auxiliary directory.
+    test -z "$auxdir" && auxdir="$ac_auxdir"
+    test -z "$auxdir" && auxdir="."
+    test -d "$destdir/$auxdir" \
+      || (test -z "$dry_run" && mkdir "$destdir/$auxdir") \
+      || func_fatal_error "aux directory $destdir/$auxdir doesn't exist"
+
     # Using libtool?
     if test -n "$seen_libtool"; then
       libtool=true
@@ -873,6 +1014,9 @@ case $mode in
       modules="$*"
     fi
 
+    # Which modules to avoid?
+    avoidlist="$avoidlist $ac_avoidlist"
+
     func_import "$modules"
     ;;