X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gnulib-tool;h=1acf074e449c6e0e67845313227e5e9a4dd15c10;hb=1a58ab824a26d93fee2b6f131ff070d1b72116c9;hp=842016faa1b5a1faef920c4c7ef945b387d4e257;hpb=dd771986fd93f2dd75de41fd7f44763cb63899c3;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index 842016faa..1acf074e4 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 15:37:43 $'
+cvsdatestamp='$Date: 2005-04-21 22:10:05 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -88,11 +88,14 @@ 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.
       --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 +120,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,6 +180,7 @@ func_fatal_error ()
 # - libname, supplied_libname  from --lib
 # - sourcebase      from --source-base
 # - m4base          from --m4-base
+# - auxdir          from --aux-dir
 # - libtool         true if --libtool was given, blank otherwise
 # - lgpl            true if --lgpl was given, blank otherwise
 # - do_changelog    false if --no-changelog was given, : otherwise
@@ -135,10 +192,12 @@ func_fatal_error ()
   supplied_libname=
   sourcebase=
   m4base=
+  auxdir=
   libtool=
   lgpl=
   do_changelog=:
   dry_run=
+  symbolic=
   lgpl=
 
   supplied_opts="$@"
@@ -208,6 +267,16 @@ func_fatal_error ()
       --m4-base=* )
         m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'`
         shift ;;
+      --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 ;;
       --libtool )
         libtool=true
         shift ;;
@@ -220,6 +289,9 @@ func_fatal_error ()
       --dry-run )
         dry_run=true
         shift ;;
+      -s | --symbolic | --symlink )
+        symbolic=true
+        shift ;;
       --help | --hel | --he | --h )
         func_usage
         exit 0 ;;
@@ -385,14 +457,107 @@ func_modules_transitive_closure ()
   done
 }
 
+# func_modules_to_filelist
+# Input:
+# - modules         list of modules, including dependencies
+# Output:
+# - files           list of files
+func_modules_to_filelist ()
+{
+  files=
+  for module in $modules; do
+    func_verify_module
+    if test -n "$module"; then
+      files="$files "`func_get_filelist $module`
+    fi
+  done
+  files=`for f in $files; do echo $f; done | sort | uniq`
+}
+
+# func_emit_lib_Makefile_am
+# emits the contents of lib/Makefile.am to standard output.
+# Input:
+# - modules         list of modules, including dependencies
+# - libname         library name
+# - libtool         true if libtool will be used, blank otherwise
+# - cmd             (optional) command that led to this invocation
+# - actioncmd       (optional) command that will reproduce this invocation
+func_emit_lib_Makefile_am ()
+{
+  if test -n "$libtool"; then
+    libext=la
+    perhapsLT=LT
+  else
+    libext=a
+    perhapsLT=
+  fi
+  echo "## Process this file with automake to produce Makefile.in."
+  echo "# Copyright (C) 2004 Free Software Foundation, Inc."
+  echo "#"
+  echo "# This file is free software, distributed under the terms of the GNU"
+  echo "# General Public License.  As a special exception to the GNU General"
+  echo "# Public License, this file may be distributed as part of a program"
+  echo "# that contains a configuration script generated by Automake, under"
+  echo "# the same distribution terms as the rest of that program."
+  echo "#"
+  echo "# Generated by gnulib-tool."
+  if test -n "$cmd"; then
+    echo "# Invoked as: $cmd"
+  fi
+  if test -n "$actioncmd"; then
+    echo "# Reproduce by: $actioncmd"
+  fi
+  echo
+  # No need to generate dependencies since the sources are in gnulib, not here.
+  echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
+  echo
+  echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
+  echo
+  echo "${libname}_${libext}_SOURCES ="
+  echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
+  echo "EXTRA_DIST ="
+  echo "BUILT_SOURCES ="
+  echo "SUFFIXES ="
+  echo "MOSTLYCLEANFILES ="
+  echo "CLEANFILES ="
+  echo "DISTCLEANFILES ="
+  echo "MAINTAINERCLEANFILES ="
+  echo
+  for module in $modules; do
+    func_verify_module
+    if test -n "$module"; then
+      {
+        func_get_automake_snippet "$module" |
+          sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g'
+        if test "$module" = 'alloca'; then
+          echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
+        fi
+      } > amsnippet.tmp
+      # Skip the contents if its entirely empty.
+      if grep '[^ 	]' amsnippet.tmp > /dev/null ; then
+        echo "## begin gnulib module $module"
+        echo
+        cat amsnippet.tmp
+        echo "## end   gnulib module $module"
+        echo
+      fi
+      rm -f amsnippet.tmp
+    fi
+  done
+  echo
+  echo "# Makefile.am ends here"
+}
+
 # func_import modules
 # Uses also the variables
 # - destdir         target directory
 # - 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
 # - lgpl            true if library's license shall be LGPL, 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 ()
 {
@@ -415,33 +580,29 @@ func_import ()
   fi
 
   # Determine final file list.
-  files=
-  for module in $modules; do
-    func_verify_module
-    if test -n "$module"; then
-      files="$files "`func_get_filelist $module`
-    fi
-  done
-  files=`for f in $files; do echo $f; done | sort | uniq`
+  func_modules_to_filelist
   echo "File list:"
   echo "$files" | sed -e 's/^/  /'
 
   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" -a -n "$lgpl" -a -n "$source"; then
+    if test -z "$dry_run" && test -n "$lgpl" && test -n "$source"; then
       perl -pi -e 's/GNU General/GNU Lesser General/g;' \
                -e 's/version 2([ ,])/version 2.1\1/g' \
                $destdir/$g
@@ -454,71 +615,27 @@ func_import ()
   if test -n "$libtool"; then
     opt_libtool="--libtool"
   fi
+  opt_lgpl=
   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 -n "$libtool"; then
-    libext=la
-    perhapsLT=LT
+  if test -z "$dry_run"; then
+    func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am.new
   else
-    libext=a
-    perhapsLT=
+    func_emit_lib_Makefile_am
   fi
-  (
-    if test -z "$dry_run"; then
-      exec > $destdir/$sourcebase/Makefile.am
-    else
-      echo "# $destdir/$sourcebase/Makefile.am"
-    fi
-    echo "## Process this file with automake to produce Makefile.in."
-    echo "# Copyright (C) 2004 Free Software Foundation, Inc."
-    echo "#"
-    echo "# This file is free software, distributed under the terms of the GNU"
-    echo "# General Public License.  As a special exception to the GNU General"
-    echo "# Public License, this file may be distributed as part of a program"
-    echo "# that contains a configuration script generated by Automake, under"
-    echo "# the same distribution terms as the rest of that program."
-    echo "#"
-    echo "# Generated by gnulib-tool."
-    echo "#"
-    echo "# Invoked as: $cmd"
-    echo "# Reproduce by: $actioncmd"
-    echo
-    echo "AUTOMAKE_OPTIONS = 1.8 gnits"
-    echo
-    echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
-    echo
-    echo "${libname}_${libext}_SOURCES ="
-    echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
-    echo "EXTRA_DIST ="
-    echo "BUILT_SOURCES ="
-    echo "SUFFIXES ="
-    echo "MOSTLYCLEANFILES ="
-    echo "CLEANFILES ="
-    echo "DISTCLEANFILES ="
-    echo "MAINTAINERCLEANFILES ="
-    for module in $modules; do
-      func_verify_module
-      if test -n "$module"; then
-        func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,${libname}_${libext}_SOURCES,g" -e "s,lib_OBJECTS,${libname}_${libext}_OBJECTS,g"
-        if test "$module" = 'alloca'; then
-          echo "${libname}_${libext}_LIBADD += @ALLOCA@"
-        fi
-      fi
-    done
-    echo
-    echo "# Makefile.am ends here"
-  )
+  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
@@ -550,6 +667,12 @@ func_import ()
       func_verify_module
       if test -n "$module"; then
         func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/  /' -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
+        if test "$module" = 'alloca' && test -n "$libtool"; then
+          echo 'changequote(,)dnl'
+          echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
+          echo 'changequote([, ])dnl'
+          echo 'AC_SUBST(LTALLOCA)'
+        fi
       fi
     done
     echo "])"
@@ -571,8 +694,14 @@ 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
+  echo
   echo "Don't forget to add \"$sourcebase/Makefile\""
   echo "to AC_CONFIG_FILES in \"$configure_ac\" and to mention"
   echo "\"`basename $sourcebase`\" in SUBDIRS in some Makefile.am."
@@ -591,63 +720,36 @@ func_create_testdir ()
   echo "$modules" | sed -e 's/^/  /'
 
   # Determine final file list.
-  files=
-  for module in $modules; do
-    func_verify_module
-    if test -n "$module"; then
-      files="$files "`func_get_filelist $module`
-    fi
-  done
-  files=`for f in $files; do echo $f; done | sort | uniq`
+  func_modules_to_filelist
   echo "File list:"
   echo "$files" | sed -e 's/^/  /'
 
   # 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.
   mkdir -p "$testdir/lib"
-  (echo "## Process this file with automake to produce Makefile.in."
-   echo
-   echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
-   echo
-   echo "noinst_LIBRARIES = $libname.a"
-   echo
-   echo "$libname"'_a_SOURCES ='
-   echo "$libname"'_a_LIBADD = @LIBOBJS@'
-   echo '#'"$libname"'_la_LIBADD = @LTLIBOBJS@'
-   echo "EXTRA_DIST ="
-   echo "BUILT_SOURCES ="
-   echo "SUFFIXES ="
-   echo "MOSTLYCLEANFILES ="
-   echo "CLEANFILES ="
-   echo "DISTCLEANFILES ="
-   echo "MAINTAINERCLEANFILES ="
-   for module in $modules; do
-     func_verify_module
-     if test -n "$module"; then
-       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
-       if test "$module" = 'alloca'; then
-         echo "$libname"'_a_LIBADD += @ALLOCA@'
-         echo '#'"$libname"'_la_LIBADD += @LTALLOCA@'
-       fi
-     fi
-   done
-  ) > "$testdir/lib/Makefile.am"
+  func_emit_lib_Makefile_am > "$testdir/lib/Makefile.am"
 
   # Create m4/Makefile.am.
   mkdir -p "$testdir/m4"
@@ -819,6 +921,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; };
@@ -844,6 +949,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