progname=$0
package=gnulib
-cvsdatestamp='$Date: 2005-09-02 17:28:31 $'
+cvsdatestamp='$Date: 2005-09-19 15:33:19 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
echo "Written by" "Bruno Haible" "and" "Simon Josefsson"
}
+# func_tmpdir
+# creates a temporary directory.
+# Sets variable
+# - tmp pathname of freshly created temporary directory
+func_tmpdir ()
+{
+ # Use the environment variable TMPDIR, falling back to /tmp. This allows
+ # users to specify a different temporary directory, for example, if their
+ # /tmp is filled up or too small.
+ : ${TMPDIR=/tmp}
+ {
+ # Use the mktemp program if available. If not available, hide the error
+ # message.
+ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/glXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+ # Use a simple mkdir command. It is guaranteed to fail if the directory
+ # already exists. $RANDOM is bash specific and expands to empty in shells
+ # other than bash, ksh and zsh. Its use does not increase security;
+ # rather, it minimizes the probability of failure in a very cluttered /tmp
+ # directory.
+ tmp=$TMPDIR/gl$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } ||
+ {
+ echo "$0: cannot create a temporary directory in $TMPDIR" >&2
+ { (exit 1); exit 1; }
+ }
+}
+
# func_fatal_error message
# outputs to stderr a fatal error message, and terminates the program.
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_readlink SYMLINK
+# outputs the target of the given symlink.
+if (type -p readlink) > /dev/null 2>&1; then
+ func_readlink ()
+ {
+ # Use the readlink program from GNU coreutils.
+ readlink "$1"
+ }
+else
+ func_readlink ()
+ {
+ # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p'
+ # would do the wrong link if the link target contains " -> ".
+ LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
+ }
+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
+ if test -L "$2" && test "$1" = "`func_readlink "$2"`"; then
:
else
- $dry rm -f "$2"
- $dry ln -s "$1" "$2"
+ rm -f "$2"
+ ln -s "$1" "$2"
fi
}
# - 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
+# - doit : if actions shall be executed, false if only to be printed
{
mode=
destdir=
libtool=
macro_prefix=
do_changelog=:
- dry_run=
+ doit=:
symbolic=
supplied_opts="$@"
do_changelog=false
shift ;;
--dry-run )
- dry_run=true
+ doit=false
shift ;;
-s | --symbolic | --symlink )
symbolic=true
esac
while test -h "$self_abspathname"; do
# Resolve symbolic link.
- sedexpr1='s, -> ,#%%#,'
- sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
- linkval=`LC_ALL=C ls -l "$self_abspathname" | sed -e "$sedexpr1" | sed -n -e "$sedexpr2"`
+ linkval=`func_readlink "$self_abspathname"`
test -n "$linkval" || break
case "$linkval" in
/* ) self_abspathname="$linkval" ;;
# - libname library name
# - libtool true if libtool will be used, blank otherwise
# - sourcebase relative directory containing lib source code
+# - m4base relative directory containing autoconf macros
+# - testsbase relative directory containing unit test code
func_emit_tests_Makefile_am ()
{
if test -n "$libtool"; then
else
libext=a
fi
+ testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'`
echo "## Process this file with automake to produce Makefile.in."
echo "# Copyright (C) 2004-2005 Free Software Foundation, Inc."
echo "#"
# Generate dependencies here, since it eases the debugging of test failures.
echo "AUTOMAKE_OPTIONS = 1.5 foreign"
echo
- echo "ACLOCAL_AMFLAGS = -I ../m4"
+ echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
echo
echo "TESTS ="
echo "noinst_PROGRAMS ="
echo
echo "AM_CPPFLAGS = \\"
echo " -I. -I\$(srcdir) \\"
- echo " -I.. -I\$(srcdir)/.. \\"
- echo " -I../${sourcebase-lib} -I\$(srcdir)/../${sourcebase-lib}"
+ echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\"
+ echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}"
echo
- echo "LDADD = ../${sourcebase-lib}/${libname}.${libext}"
+ echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}"
echo
for module in $modules; do
func_verify_tests_module
# - libname library name
# - sourcebase directory relative to destdir where to place source code
# - m4base directory relative to destdir where to place *.m4 macros
+# - testsbase directory relative to destdir where to place unit test code
# - auxdir directory relative to destdir where to place build aux files
+# - inctests true if --with-tests was given, 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
# - guessed_libtool true if the configure.ac file uses libtool, blank otherwise
# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
-# - dry_run true if actions shall only be printed, blank otherwise
+# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if files should be symlinked, copied otherwise
func_import ()
{
cached_avoidlist=
cached_sourcebase=
cached_m4base=
+ cached_testsbase=
cached_libname=
cached_lgpl=
cached_libtool=
/gl_M4_BASE(/ {
s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p
}
+ /gl_TESTS_BASE(/ {
+ s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p
+ }
/gl_LIB(/ {
s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p
}
func_fatal_error "missing --source-base option"
fi
fi
+ # The testsbase defaults to the cached one.
+ if test -z "$testsbase"; then
+ testsbase="$cached_testsbase"
+ if test -z "$testsbase"; then
+ func_fatal_error "missing --tests-base option"
+ fi
+ fi
# The libname defaults to the cached one.
if test -z "$supplied_libname"; then
libname="$cached_libname"
fi
# Create directories.
- test -d "$destdir/$sourcebase" \
- || { test -n "$dry_run" || mkdir "$destdir/$sourcebase" || func_fatal_error "failed"; }
- test -d "$destdir/$m4base" \
- || { test -n "$dry_run" || mkdir "$destdir/$m4base" || func_fatal_error "failed"; }
- test -d "$destdir/$auxdir" \
- || { test -n "$dry_run" || mkdir "$destdir/$auxdir" || func_fatal_error "failed"; }
+ if test ! -d "$destdir/$sourcebase"; then
+ if $doit; then
+ echo "Creating directory $destdir/$sourcebase"
+ mkdir "$destdir/$sourcebase" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$sourcebase"
+ fi
+ fi
+ if test ! -d "$destdir/$m4base"; then
+ if $doit; then
+ echo "Creating directory $destdir/$m4base"
+ mkdir "$destdir/$m4base" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$m4base"
+ fi
+ fi
+ if test -n "$inctests"; then
+ if test ! -d "$destdir/$testsbase"; then
+ if $doit; then
+ echo "Creating directory $destdir/$testsbase"
+ mkdir "$destdir/$testsbase" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$testsbase"
+ fi
+ fi
+ fi
+ if test ! -d "$destdir/$auxdir"; then
+ if $doit; then
+ echo "Creating directory $destdir/$auxdir"
+ mkdir "$destdir/$auxdir" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$auxdir"
+ fi
+ fi
# Copy files or make symbolic links. Remove obsolete files.
- for f1 in $old_files; do
- case "$f1" in
- build-aux/*) g1=`echo "$f1" | sed -e "s,^build-aux/,$auxdir/,"` ;;
- lib/*) g1=`echo "$f1" | sed -e "s,^lib/,$cached_sourcebase/,"` ;;
- m4/*) g1=`echo "$f1" | sed -e "s,^m4/,$cached_m4base/,"` ;;
- *) g1="$f1" ;;
+ func_tmpdir
+ trap 'rm -rf "$tmp"' 0 1 2 3 15
+ delimiter=' '
+ for f in $old_files; do
+ case "$f" in
+ build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ lib/*) g=`echo "$f" | sed -e "s,^lib/,$cached_sourcebase/,"` ;;
+ m4/*) g=`echo "$f" | sed -e "s,^m4/,$cached_m4base/,"` ;;
+ *) g="$f" ;;
esac
- still_present=
- for f2 in $new_files; do
- case "$f2" in
- build-aux/*) g2=`echo "$f2" | sed -e "s,^build-aux/,$auxdir/,"` ;;
- lib/*) g2=`echo "$f2" | sed -e "s,^lib/,$sourcebase/,"` ;;
- m4/*) g2=`echo "$f2" | sed -e "s,^m4/,$m4base/,"` ;;
- *) g2="$f2" ;;
- esac
- if test "$g2" = "$g1"; then
- still_present=true
- break
- fi
- done
- if test -z "$still_present"; then
- # Remove the file. Do nothing if the user already removed it.
- if test -f "$destdir/$g1"; then
- echo "Removing file $g1 (backup in ${g1}~)"
- test -n "$dry_run" && dry=echo
- $dry mv -f "$destdir/$g1" "$destdir/${g1}~" || func_fatal_error "failed"
+ echo "$g""$delimiter""$f"
+ done | LC_ALL=C sort > "$tmp"/old-files
+ for f in $new_files; do
+ case "$f" in
+ build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
+ m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
+ *) g="$f" ;;
+ esac
+ echo "$g""$delimiter""$f"
+ done | LC_ALL=C sort > "$tmp"/new-files
+ # First the files that are in old-files, but not in new-files:
+ for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'"$delimiter"'.*,,'`; do
+ # Remove the file. Do nothing if the user already removed it.
+ if test -f "$destdir/$g"; then
+ if $doit; then
+ echo "Removing file $g (backup in ${g}~)"
+ mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
+ else
+ echo "Remove file $g (backup in ${g}~)"
fi
fi
done
- for f2 in $new_files; do
- case "$f2" in
- build-aux/*) g2=`echo "$f2" | sed -e "s,^build-aux/,$auxdir/,"` ;;
- lib/*) g2=`echo "$f2" | sed -e "s,^lib/,$sourcebase/,"` ;;
- m4/*) g2=`echo "$f2" | sed -e "s,^m4/,$m4base/,"` ;;
- *) g2="$f2" ;;
- esac
- already_present=
- for f1 in $old_files; do
- case "$f1" in
- build-aux/*) g1=`echo "$f1" | sed -e "s,^build-aux/,$auxdir/,"` ;;
- lib/*) g1=`echo "$f1" | sed -e "s,^lib/,$cached_sourcebase/,"` ;;
- m4/*) g1=`echo "$f1" | sed -e "s,^m4/,$cached_m4base/,"` ;;
- *) g1="$f1" ;;
- esac
- if test "$g1" = "$g2"; then
- already_present=true
- break
- fi
- done
- cp "$gnulib_dir/$f2" "$destdir/$g2.tmp" || func_fatal_error "failed"
+ # func_add_or_update handles a file that ought to be present afterwards.
+ # Uses parameters f, g, already_present.
+ func_add_or_update ()
+ {
+ cp "$gnulib_dir/$f" "$destdir/$g.tmp" || func_fatal_error "failed"
if test -n "$lgpl"; then
# Update license.
- case "$f2" in
+ case "$f" in
lib/*)
sed -e 's/GNU General/GNU Lesser General/g' \
-e 's/version 2\([ ,]\)/version 2.1\1/g' \
- < "$gnulib_dir/$f2" > "$destdir/$g2.tmp" || func_fatal_error "failed"
+ < "$gnulib_dir/$f" > "$destdir/$g.tmp" || func_fatal_error "failed"
;;
esac
fi
- if test -f "$destdir/$g2"; then
+ if test -f "$destdir/$g"; then
# The file already exists.
- if cmp "$destdir/$g2" "$destdir/$g2.tmp" > /dev/null; then
+ if cmp "$destdir/$g" "$destdir/$g.tmp" > /dev/null; then
: # The file has not changed.
else
# Replace the file.
- if test -n "$already_present"; then
- echo "Updating file $g2 (backup in ${g2}~)"
- else
- echo "Replacing file $g2 (non-gnulib code backuped in ${g2}~) !!"
- fi
- test -n "$dry_run" && dry=echo
- $dry mv -f "$destdir/$g2" "$destdir/${g2}~" || func_fatal_error "failed"
- if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp" > /dev/null; then
- func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2"
+ if $doit; then
+ if test -n "$already_present"; then
+ echo "Updating file $g (backup in ${g}~)"
+ else
+ echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!"
+ fi
+ mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
+ if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
+ func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ else
+ mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ fi
else
- $dry mv -f "$destdir/$g2.tmp" "$destdir/${g2}" || func_fatal_error "failed"
+ if test -n "$already_present"; then
+ echo "Update file $g (backup in ${g}~)"
+ else
+ echo "Replace file $g (non-gnulib code backuped in ${g}~) !!"
+ fi
fi
fi
else
# Install the file.
# Don't protest if the file should be there but isn't: it happens
# frequently that developers don't put autogenerated files into CVS.
- echo "Copying file $g2"
- test -n "$dry_run" && dry=echo
- if test -z "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then
- func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2"
+ if $doit; then
+ echo "Copying file $g"
+ if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
+ func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ else
+ mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ fi
else
- $dry mv -f "$destdir/$g2.tmp" "$destdir/${g2}" || func_fatal_error "failed"
+ echo "Copy file $g"
fi
fi
- rm -f "$destdir/$g2.tmp"
+ rm -f "$destdir/$g.tmp"
+ }
+ # Then the files that are in new-files, but not in old-files:
+ already_present=
+ for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do
+ case "$f" in
+ build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
+ m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
+ *) g="$f" ;;
+ esac
+ func_add_or_update
+ done
+ # Then the files that are in new-files and in old-files:
+ already_present=true
+ for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do
+ case "$f" in
+ build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
+ m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
+ *) g="$f" ;;
+ esac
+ func_add_or_update
done
+ rm -rf "$tmp"
+ trap - 0 1 2 3 15
# Command-line invocation printed in a comment in generated gnulib-cache.m4.
actioncmd="gnulib-tool --import"
if test -n "$libtool"; then
actioncmd="$actioncmd --libtool"
fi
- actioncmd="$actioncmd -macro-prefix=$macro_prefix"
+ actioncmd="$actioncmd --macro-prefix=$macro_prefix"
actioncmd="$actioncmd `echo $specified_modules`"
# Create lib/Makefile.am.
- if test -z "$dry_run"; then
- func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp
- if test -f "$destdir"/$sourcebase/Makefile.am; then
- if cmp "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am.tmp > /dev/null; then
- rm -f "$destdir"/$sourcebase/Makefile.am.tmp
- else
+ func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp
+ if test -f "$destdir"/$sourcebase/Makefile.am; then
+ if cmp "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am.tmp > /dev/null; then
+ rm -f "$destdir"/$sourcebase/Makefile.am.tmp
+ else
+ if $doit; then
echo "Updating $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)"
mv -f "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am~
mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am
+ else
+ echo "Update $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)"
+ rm -f "$destdir"/$sourcebase/Makefile.am.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $sourcebase/Makefile.am"
mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am
+ else
+ echo "Create $sourcebase/Makefile.am"
+ rm -f "$destdir"/$sourcebase/Makefile.am.tmp
fi
- else
- echo "Creating $sourcebase/Makefile.am..."
- func_emit_lib_Makefile_am
fi
# Create m4/gnulib-cache.m4.
(
- if test -z "$dry_run"; then
- exec > "$destdir"/$m4base/gnulib-cache.m4.tmp
- else
- echo "Creating $m4base/gnulib-cache.m4..."
- echo "# $destdir/$m4base/gnulib-cache.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 "gl_AVOID([$avoidlist])"
echo "gl_SOURCE_BASE([$sourcebase])"
echo "gl_M4_BASE([$m4base])"
+ echo "gl_TESTS_BASE([$testsbase])"
echo "gl_LIB([$libname])"
test -z "$lgpl" || echo "gl_LGPL"
test -z "$libtool" || echo "gl_LIBTOOL"
echo "gl_MACRO_PREFIX([$macro_prefix])"
- echo
- echo "# gnulib-cache.m4 ends here"
- )
- if test -z "$dry_run"; then
- if test -f "$destdir"/$m4base/gnulib-cache.m4; then
- if cmp "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4.tmp > /dev/null; then
- rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
- else
+ ) > "$destdir"/$m4base/gnulib-cache.m4.tmp
+ if test -f "$destdir"/$m4base/gnulib-cache.m4; then
+ if cmp "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4.tmp > /dev/null; then
+ rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
+ else
+ if $doit; then
echo "Updating $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
mv -f "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4~
mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4
+ else
+ echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
+ if false; then
+ cat "$destdir"/$m4base/gnulib-cache.m4.tmp
+ echo
+ echo "# gnulib-cache.m4 ends here"
+ fi
+ rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $m4base/gnulib-cache.m4"
mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4
+ else
+ echo "Create $m4base/gnulib-cache.m4"
+ cat "$destdir"/$m4base/gnulib-cache.m4.tmp
+ rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
fi
fi
# Create m4/gnulib-comp.m4.
(
- if test -z "$dry_run"; then
- exec > "$destdir"/$m4base/gnulib-comp.m4.tmp
- else
- echo "Creating $m4base/gnulib-comp.m4..."
- echo "# $destdir/$m4base/gnulib-comp.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 "AC_DEFUN([${macro_prefix}_FILE_LIST], ["
echo "$files" | sed -e 's,^, ,'
echo "])"
- echo
- echo "# gnulib-comp.m4 ends here"
- )
- if test -z "$dry_run"; then
- if test -f "$destdir"/$m4base/gnulib-comp.m4; then
- if cmp "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4.tmp > /dev/null; then
- rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
- else
+ ) > "$destdir"/$m4base/gnulib-comp.m4.tmp
+ if test -f "$destdir"/$m4base/gnulib-comp.m4; then
+ if cmp "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4.tmp > /dev/null; then
+ rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
+ else
+ if $doit; then
echo "Updating $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
mv -f "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4~
mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4
+ else
+ echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
+ if false; then
+ cat "$destdir"/$m4base/gnulib-comp.m4.tmp
+ echo
+ echo "# gnulib-comp.m4 ends here"
+ fi
+ rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $m4base/gnulib-comp.m4"
mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4
+ else
+ echo "Create $m4base/gnulib-comp.m4"
+ cat "$destdir"/$m4base/gnulib-comp.m4.tmp
+ rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
+ fi
+ fi
+
+ if test -n "$inctests"; then
+ # Create tests/Makefile.am.
+ func_emit_tests_Makefile_am > "$destdir"/$testsbase/Makefile.am.tmp
+ if test -f "$destdir"/$testsbase/Makefile.am; then
+ if cmp "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am.tmp > /dev/null; then
+ rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ else
+ if $doit; then
+ echo "Updating $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)"
+ mv -f "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am~
+ mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am
+ else
+ echo "Update $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)"
+ rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $testsbase/Makefile.am"
+ mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am
+ else
+ echo "Create $testsbase/Makefile.am"
+ rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ fi
fi
fi
echo
echo "Don't forget to"
echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
+ if test -n "$inctests"; then
+ echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
+ fi
sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'`
sourcebase_base=`basename "$sourcebase"`
echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am,"
+ if test -n "$inctests"; then
+ testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'`
+ testsbase_base=`basename "$testsbase"`
+ echo " - mention \"${testsbase_base}\" in SUBDIRS in ${testsbase_dir}Makefile.am,"
+ fi
echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am,"
echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC,"
echo " - invoke ${macro_prefix}_INIT in $configure_ac."
test -d "$testdir/tests" || mkdir "$testdir/tests"
# Create tests/Makefile.am.
sourcebase=lib
+ m4base=m4
+ testsbase=tests
func_emit_tests_Makefile_am > "$testdir/tests/Makefile.am"
# Create tests/configure.ac.
(echo "# Process this file with autoconf to produce a configure script."