X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=ac9b0bf247122c71a2b489a6defb1a766aa25b58;hb=414353f839d107fb5ea1e030961ba5a69962f692;hp=3fe02644de9198be1b50d694431942b2e1f1f6fa;hpb=77a19256668678bf6dfd4e2ed332958e00dcf29d;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 3fe02644d..ac9b0bf24 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 @@ -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,23 +22,20 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2004-08-12 20:47:12 $' +cvsdatestamp='$Date: 2005-07-11 11:37:09 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH. AUTOCONFPATH= -case $USER in - bruno ) - AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin - AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH " - ;; -esac +#case $USER in +# bruno ) +# AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin +# AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH " +# ;; +#esac -AUTOCONF="${AUTOCONFPATH}autoconf" -AUTOHEADER="${AUTOCONFPATH}autoheader" -AUTOMAKE="${AUTOCONFPATH}automake-1.7" -ACLOCAL="aclocal-1.7" +AUTORECONF="${AUTOCONFPATH}autoreconf" # func_usage # outputs to stdout the --help usage message. @@ -46,7 +43,7 @@ func_usage () { echo "\ Usage: gnulib-tool --list - gnulib-tool --import [MODULE...] + gnulib-tool --import [module1 ... moduleN] gnulib-tool --create-testdir --dir=directory module1 ... moduleN gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] gnulib-tool --test --dir=directory module1 ... moduleN @@ -57,6 +54,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-license module gnulib-tool --extract-maintainer module Operation modes: @@ -75,11 +73,13 @@ Operation modes: --extract-autoconf-snippet extract the snippet for configure.ac --extract-automake-snippet extract the snippet for lib/Makefile.am --extract-include-directive extract the #include directive + --extract-license report the license terms of the source files + under lib/ --extract-maintainer report the maintainer(s) inside gnulib Options: --dir=DIRECTORY specify the target directory - For --import, this specify where your + For --import, this specifies where your configure.ac can be found. Defaults to current directory. --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. @@ -88,8 +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 ." } @@ -114,23 +123,88 @@ 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 # - destdir from --dir -# - libname from --lib +# - libname, supplied_libname from --lib # - sourcebase from --source-base # - m4base from --m4-base +# - 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 { mode= destdir= libname=libgnu - sourcebase=lib - m4base=m4 + supplied_libname= + sourcebase= + m4base= + auxdir= + avoidlist= + lgpl= libtool= do_changelog=: + dry_run= + symbolic= + + supplied_opts="$@" while test $# -gt 0; do case "$1" in @@ -171,9 +245,11 @@ func_fatal_error () func_fatal_error "missing argument for --lib" fi libname=$1 + supplied_libname=true shift ;; --lib=* ) libname=`echo "X$1" | sed -e 's/^X--lib=//'` + supplied_libname=true shift ;; --source-base ) shift @@ -195,12 +271,41 @@ 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 ;; + --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 ;; @@ -252,7 +357,7 @@ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` func_all_modules () { (cd "$gnulib_dir/modules" && ls -1) \ - | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^TEMPLATE$/d' -e '/~$/d' \ + | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/~$/d' \ | sort } @@ -263,6 +368,7 @@ func_verify_module () if test ! -f "$gnulib_dir/modules/$module" \ || test "CVS" = "$module" \ || test "ChangeLog" = "$module" \ + || test "README" = "$module" \ || test "TEMPLATE" = "$module"; then echo "gnulib-tool: module $module doesn't exist" 1>&2 module= @@ -278,6 +384,7 @@ sed_extract_prog=':[ ]*$/ { s/^configure\.ac:[ ]*$// s/^Makefile\.am:[ ]*$// s/^Include:[ ]*$// + s/^License:[ ]*$// s/^Maintainer:[ ]*$// tb p @@ -324,31 +431,58 @@ func_get_include_directive () sed -e 's/^\(["<]\)/#include \1/' } +# func_get_license module +func_get_license () +{ + sed -n -e "/^License$sed_extract_prog" < "$gnulib_dir/modules/$1" +} + # func_get_maintainer module func_get_maintainer () { sed -n -e "/^Maintainer$sed_extract_prog" < "$gnulib_dir/modules/$1" } -# func_create_testdir testdir modules -func_create_testdir () +# func_acceptable module +# tests whether a module is acceptable. +# Input: +# - avoidlist list of modules to avoid +func_acceptable () { - testdir="$1" - modules="$2" - modules=`for m in $modules; do echo $m; done | sort | uniq` + for avoid in $avoidlist; do + if test "$avoid" = "$1"; then + return 1 + fi + done + return 0 +} - # Determine final module list. +# 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 () +{ while true; do xmodules= 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` @@ -357,10 +491,15 @@ func_create_testdir () fi modules="$xmodules" done - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' +} - # Determine final file list. +# 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 @@ -369,55 +508,288 @@ func_create_testdir () 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 +# - 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 () +{ + modules="$1" + modules=`for m in $modules; do echo $m; done | sort | uniq` + + # Determine final module list. + func_modules_transitive_closure + echo "Module list with included dependencies:" + echo "$modules" | sed -e 's/^/ /' + + # If --lgpl, check the license of modules are compatible. + if test -n "$lgpl"; then + for module in $modules; do + license=`func_get_license $module` + case $license in + LGPL | 'public domain') ;; + *) + func_fatal_error \ + "incompatible license on module \`$module\`: $license" ;; + esac + done + fi + + # Determine final file list. + func_modules_to_filelist + echo "File list:" + echo "$files" | sed -e 's/^/ /' + + test -n "$files" \ + || func_fatal_error "refusing to do nothing" + + # Copy files or make symbolic links. + for f in $files; do + source= + case "$f" in + 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 + 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;' \ + -e 's/version 2([ ,])/version 2.1\1/g' \ + $destdir/$g + fi + done + + # Commands printed in a comment in generated files. + cmd="gnulib-tool $supplied_opts" + opt_libtool= + 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 --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.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.new + else + echo "# $destdir/$m4base/gnulib.m4" + fi + echo "# Copyright (C) 2004 Free Software Foundation, Inc." + 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 Autoconf, 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 "AC_DEFUN([gl_EARLY]," + echo "[" + if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then + echo " AC_GNU_SOURCE" + fi + if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then + echo " gl_USE_SYSTEM_EXTENSIONS" + fi + echo "])" + echo + echo "AC_DEFUN([gl_INIT]," + echo "[" + for module in $modules; do + 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 "])" + echo + echo "dnl Usage: gl_MODULES(module1 module2 ...)" + echo "AC_DEFUN([gl_MODULES], [])" + echo + echo "dnl Usage: gl_SOURCE_BASE(DIR)" + echo "AC_DEFUN([gl_SOURCE_BASE], [])" + echo + echo "dnl Usage: gl_M4_BASE(DIR)" + echo "AC_DEFUN([gl_M4_BASE], [])" + echo + echo "dnl Usage: gl_LIB(LIBNAME)" + echo "AC_DEFUN([gl_LIB], [])" + echo + echo "dnl Usage: gl_LGPL" + echo "AC_DEFUN([gl_LGPL], [])" + 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" + 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" + echo "\"`basename $sourcebase`\" in SUBDIRS in some Makefile.am." +} + +# func_create_testdir testdir modules +func_create_testdir () +{ + testdir="$1" + modules="$2" + modules=`for m in $modules; do echo $m; done | sort | uniq` + + # Determine final module list. + func_modules_transitive_closure + echo "Module list with included dependencies:" + echo "$modules" | sed -e 's/^/ /' + + # Determine final file list. + 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" @@ -489,14 +861,8 @@ func_create_testdir () # Create autogenerated files. (cd "$testdir" - echo "executing ${ACLOCAL} -I m4" - ${ACLOCAL} -I m4 - echo "executing ${AUTOHEADER}" - ${AUTOHEADER} - echo "executing ${AUTOCONF}" - ${AUTOCONF} - echo "executing ${AUTOMAKE} --add-missing --copy" - ${AUTOMAKE} --add-missing --copy + echo "executing ${AUTORECONF} --force --install" + ${AUTORECONF} --force --install ) if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then (cd "$testdir" @@ -554,12 +920,8 @@ func_create_megatestdir () # Create autogenerated files. (cd "$megatestdir" - echo "executing ${ACLOCAL}" - ${ACLOCAL} - echo "executing ${AUTOCONF}" - ${AUTOCONF} - echo "executing ${AUTOMAKE} --add-missing --copy Makefile" - ${AUTOMAKE} --add-missing --copy Makefile + echo "executing ${AUTORECONF} --force --install" + ${AUTORECONF} --force --install ) } @@ -572,171 +934,82 @@ case $mode in ;; import ) - if test -z "$destdir"; then - destdir=. - fi - test -d "$destdir" \ - || func_fatal_error "destination directory does not exist: $destdir" - sourcebase=`cd $destdir; $AUTOCONF --trace=gl_SOURCE_BASE | sed 's,^.*:,,g'` - test -d "$destdir/$sourcebase" || \ - mkdir "$destdir/$sourcebase" || \ - func_fatal_error \ - "could not create source base directory: $destdir/$sourcebase" - m4base=`cd $destdir; $AUTOCONF --trace=gl_M4_BASE | sed 's,^.*:,,g'` - test -d "$destdir/$m4base" || \ - mkdir "$destdir/$m4base" || \ - func_fatal_error \ - "could not create m4 base directory: $destdir/$m4base" - supplied_modules="$*" - modules=`for m in $supplied_modules; do echo $m; done | sort | uniq` - if test -z "$modules"; then - modules=`cd $destdir; $AUTOCONF --trace=gl_MODULES | sed 's,^.*:,,g'` - fi - if test x`cd $destdir; $AUTOCONF --trace=AC_PROG_LIBTOOL` != x; then - libtool=true - fi - - # Determine final module list. - while true; do - xmodules= - for module in $modules; do - func_verify_module - if test -n "$module"; then - # Duplicate dependenies 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` - fi - done - xmodules=`for m in $xmodules; do echo $m; done | sort | uniq` - if test "$xmodules" = "$modules"; then - break - fi - modules="$xmodules" - done - echo "Module list with included dependencies:" - 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` - echo "File list:" - echo "$files" | sed -e 's/^/ /' - - # Copy files. - for f in $files; do - case "$f" in - config/*) g=`echo "$f" | sed -e 's,^config/,,'` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; - *) g="$f" ;; - esac - cp -p "$gnulib_dir/$f" "$destdir/$g" - done - - # Create 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." - echo "#" - opt_libtool= - if test -n "$libtool"; then - opt_libtool="--libtool" - fi - echo "# gnulib-tool --import --dir=$destdir --lib=$libname --source-base=$sourcebase --m4-base=$m4base $opt_libtool $supplied_modules" - 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 - ) > "$destdir/$sourcebase/Makefile.am" - - # Create gnulib.m4. - (echo "# Copyright (C) 2004 Free Software Foundation, Inc." - 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 Autoconf, under" - echo "# the same distribution terms as the rest of that program." - echo "#" - echo "# Generated by gnulib-tool." - echo "#" - opt_libtool= - if test -n "$libtool"; then - opt_libtool="--libtool" - fi - echo "# gnulib-tool --import --dir=$destdir --lib=$libname --source-base=$sourcebase --m4-base=$m4base $opt_libtool $supplied_modules" - echo - echo "AC_DEFUN([gl_EARLY]," - echo "[" - if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then - echo " AC_GNU_SOURCE" - fi - if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then - echo " gl_USE_SYSTEM_EXTENSIONS" - fi - echo "])" - echo - echo "AC_DEFUN([gl_INIT]," - echo "[" - for module in $modules; do - 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./' - fi - done - echo "])" - echo - echo "dnl Usage: gl_MODULES(module1 module2 ...)" - echo "AC_DEFUN([gl_MODULES], [])" - echo - echo "dnl Usage: gl_SOURCE_BASE(DIR)" - echo "AC_DEFUN([gl_SOURCE_BASE], [])" - echo - echo "dnl Usage: gl_M4_BASE(DIR)" - echo "AC_DEFUN([gl_M4_BASE], [])" - ) > "$destdir/$m4base/gnulib.m4" - ;; + # Where to import. + if test -z "$destdir"; then + destdir=. + fi + test -d "$destdir" \ + || func_fatal_error "destination directory does not exist: $destdir" + + # Prefer configure.ac to configure.in + test -f $destdir/configure.in && configure_ac=$destdir/configure.in + test -f $destdir/configure.ac && configure_ac=$destdir/configure.ac + test -f "$configure_ac" \ + || func_fatal_error "cannot find $destdir/configure.ac" + + # Get settings. + my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,; + /gl_MODULES[^_]/ { + s,^.*gl_MODULES([[ ]*\([^])]*\).*$,ac_modules="\1",; p; + }; + /gl_SOURCE_BASE/ { + s,^.*gl_SOURCE_BASE([[ ]*\([^])]*\).*$,ac_sourcebase="\1",; p; + }; + /gl_M4_BASE/ { + s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,ac_m4base="\1",; p; + }; + /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; }; + d;' + eval `cat $configure_ac | sed "$my_sed_traces"` + + # Override libname? + if test -z "$supplied_libname" && test -n "$ac_libname"; then + libname="$ac_libname" + fi + + # Set up source base. + test -z "$sourcebase" && sourcebase="$ac_sourcebase" + test -z "$sourcebase" && sourcebase="lib" + test -d "$destdir/$sourcebase" \ + || (test -z "$dry_run" && mkdir "$destdir/$sourcebase") \ + || func_fatal_error "source base $destdir/$sourcebase doesn't exist" + + # Set up m4 base. + test -z "$m4base" && m4base="$ac_m4base" + test -z "$m4base" && m4base="m4" + test -d "$destdir/$m4base" \ + || (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 + fi + + # What modules to extract. + if test $# = 0; then + modules="$ac_modules" + else + modules="$*" + fi + + func_import "$modules" + ;; create-testdir ) if test -z "$destdir"; then @@ -860,6 +1133,16 @@ case $mode in done ;; + extract-license ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_license "$module" + fi + done + ;; + extract-maintainer ) for module do