progname=$0
package=gnulib
-cvsdatestamp='$Date: 2007-03-11 22:16:19 $'
+cvsdatestamp='$Date: 2007-07-19 20:06:45 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
'
+IFS=" "" $nl"
# You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
AUTOCONFPATH=
placed (default \"lib\").
--m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are
placed (default \"m4\").
+ --po-base=DIRECTORY Directory relative to --dir where *.po files are
+ placed (default \"po\").
--doc-base=DIRECTORY Directory relative to --dir where doc files are
placed (default \"doc\").
--tests-base=DIRECTORY
--no-libtool Don't use libtool rules.
--macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and
'gl_INIT'. Default is 'gl'.
+ --po-domain=NAME Specify the prefix of the i18n domain. Usually use
+ the package name. A suffix '-gnulib' is appended.
--no-changelog don't update or create ChangeLog files
Options for --import and --update:
-s, --symbolic, --symlink Make symbolic links instead of copying files.
--local-symlink Make symbolic links instead of copying files, only
for files from the local override directory.
+ -S, --more-symlinks Make symbolic links instead of copying files, and
+ don't replace copyright notices.
Report bugs to <bug-gnulib@gnu.org>."
}
fi
}
+# Ensure an 'echo' command that does not interpret backslashes.
+# Test cases:
+# echo '\n' | wc -l prints 1 when OK, 2 when KO
+# echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO
+# This problem is a weird heritage from SVR4. BSD got it right (except that
+# BSD echo interprets '-n' as an option, which is also not desirable).
+# Nowadays the problem occurs in 4 situations:
+# - in bash, when the shell option xpg_echo is set (bash >= 2.04)
+# or when it was built with --enable-usg-echo-default (bash >= 2.0)
+# or when it was built with DEFAULT_ECHO_TO_USG (bash < 2.0),
+# - in zsh, when sh-emulation is not set,
+# - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances,
+# and HP-UX /bin/sh and IRIX /bin/sh behave similarly),
+# - in Solaris /bin/sh and OSF/1 /bin/sh.
+# We try the following workarounds:
+# - for all: respawn using $CONFIG_SHELL if that is set and works.
+# - for bash >= 2.04: unset the shell option xpg_echo.
+# - for bash >= 2.0: define echo to a function that uses the printf built-in.
+# - for bash < 2.0: define echo to a function that uses cat of a here document.
+# - for zsh: turn sh-emulation on.
+# - for ksh: alias echo to 'print -r'.
+# - for ksh: alias echo to a function that uses cat of a here document.
+# - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on
+# the ksh workaround.
+# - otherwise: respawn using /bin/sh and rely on the workarounds.
+# When respawning, we pass --no-reexec as first argument, so as to avoid
+# turning this script into a fork bomb in unlucky situations.
+have_echo=
+if echo '\t' | grep t > /dev/null; then
+ have_echo=yes # Lucky!
+fi
+# Try the workarounds.
+# Respawn using $CONFIG_SHELL if that is set and works.
+if test -z "$have_echo" \
+ && test "X$1" != "X--no-reexec" \
+ && test -n "$CONFIG_SHELL" \
+ && test -f "$CONFIG_SHELL" \
+ && $CONFIG_SHELL -c 'echo '\t' | grep t > /dev/null'; then
+ exec $CONFIG_SHELL "$0" --no-reexec "$@"
+ exit 127
+fi
+# For bash >= 2.04: unset the shell option xpg_echo.
+if test -z "$have_echo" \
+ && test -n "$BASH_VERSION" \
+ && (shopt -o xpg_echo; echo '\t' | grep t > /dev/null) 2>/dev/null; then
+ shopt -o xpg_echo
+ have_echo=yes
+fi
+# For bash >= 2.0: define echo to a function that uses the printf built-in.
+# For bash < 2.0: define echo to a function that uses cat of a here document.
+# (There is no win in using 'printf' over 'cat' if it is not a shell built-in.)
+if test -z "$have_echo" \
+ && test -n "$BASH_VERSION"; then \
+ if type printf 2>/dev/null | grep / > /dev/null; then
+ # 'printf' is not a shell built-in.
+echo ()
+{
+cat <<EOF
+$*
+EOF
+}
+ else
+ # 'printf' is a shell built-in.
+echo ()
+{
+ printf '%s\n' "$*"
+}
+ fi
+ if echo '\t' | grep t > /dev/null; then
+ have_echo=yes
+ fi
+fi
+# For zsh: turn sh-emulation on.
+if test -z "$have_echo" \
+ && test -n "$ZSH_VERSION" \
+ && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+fi
+# For ksh: alias echo to 'print -r'.
+if test -z "$have_echo" \
+ && (type print) >/dev/null 2>&1; then
+ # A 'print' command exists.
+ if type print 2>/dev/null | grep / > /dev/null; then
+ :
+ else
+ # 'print' is a shell built-in.
+ if (print -r '\told' | grep told > /dev/null) 2>/dev/null; then
+ # 'print' is the ksh shell built-in.
+ alias echo='print -r'
+ fi
+ fi
+fi
+if test -z "$have_echo" \
+ && echo '\t' | grep t > /dev/null; then
+ have_echo=yes
+fi
+# For ksh: alias echo to a function that uses cat of a here document.
+# The ksh manual page says:
+# "Aliasing is performed when scripts are read, not while they are executed.
+# Therefore, for an alias to take effect, the alias definition command has
+# to be executed before the command which references the alias is read."
+# Because of this, we have to play strange tricks with have_echo, to ensure
+# that the top-level statement containing the test starts after the 'alias'
+# command.
+if test -z "$have_echo"; then
+bsd_echo ()
+{
+cat <<EOF
+$*
+EOF
+}
+alias echo=bsd_echo 2>/dev/null
+fi
+if test -z "$have_echo" \
+ && echo '\t' | grep t > /dev/null; then
+ have_echo=yes
+fi
+if test -z "$have_echo"; then
+ unalias echo 2>/dev/null
+fi
+# For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh.
+if test -z "$have_echo" \
+ && test "X$1" != "X--no-reexec" \
+ && test -f /bin/ksh; then
+ exec /bin/ksh "$0" --no-reexec "$@"
+ exit 127
+fi
+# Otherwise: respawn using /bin/sh.
+if test -z "$have_echo" \
+ && test "X$1" != "X--no-reexec" \
+ && test -f /bin/sh; then
+ exec /bin/sh "$0" --no-reexec "$@"
+ exit 127
+fi
+if test -z "$have_echo"; then
+ func_fatal_error "Shell does not support 'echo' correctly. Please install GNU bash and set the environment variable CONFIG_SHELL to point to it."
+fi
+if echo '\t' | grep t > /dev/null; then
+ : # Works fine now.
+else
+ func_fatal_error "Shell does not support 'echo' correctly. Workaround does not work. Please report this as a bug to bug-gnulib@gnu.org."
+fi
+if test "X$1" = "X--no-reexec"; then
+ shift
+fi
+
# Command-line option processing.
# Removes the OPTIONS from the arguments. Sets the variables:
# - mode list or import or create-testdir or create-megatestdir
# - libname, supplied_libname from --lib
# - sourcebase from --source-base
# - m4base from --m4-base
+# - pobase from --po-base
# - docbase from --doc-base
# - testsbase from --tests-base
# - auxdir from --aux-dir
# - libtool true if --libtool was given, false if --no-libtool was
# given, blank otherwise
# - macro_prefix from --macro-prefix
+# - po_domain from --po-domain
# - autoconf_minversion minimum supported autoconf version
# - do_changelog false if --no-changelog was given, : otherwise
# - doit : if actions shall be executed, false if only to be printed
-# - symbolic true if --symlink was given, blank otherwise
+# - symbolic true if --symlink or --more-symlinks was given, blank
+# otherwise
# - lsymbolic true if --local-symlink was given, blank otherwise
+# - do_copyrights blank if --more-symlinks was given, true otherwise
{
mode=
destdir=
supplied_libname=
sourcebase=
m4base=
+ pobase=
docbase=
testsbase=
auxdir=
makefile_name=
libtool=
macro_prefix=
+ po_domain=
do_changelog=:
doit=:
symbolic=
lsymbolic=
+ do_copyrights=true
supplied_opts="$@"
--m4-base=* )
m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'`
shift ;;
+ --po-base )
+ shift
+ if test $# = 0; then
+ func_fatal_error "missing argument for --po-base"
+ fi
+ pobase=$1
+ shift ;;
+ --po-base=* )
+ pobase=`echo "X$1" | sed -e 's/^X--po-base=//'`
+ shift ;;
--doc-base )
shift
if test $# = 0; then
--macro-prefix=* )
macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'`
shift ;;
+ --po-domain )
+ shift
+ if test $# = 0; then
+ func_fatal_error "missing argument for --po-domain"
+ fi
+ po_domain="$1"
+ shift ;;
+ --po-domain=* )
+ po_domain=`echo "X$1" | sed -e 's/^X--po-domain=//'`
+ shift ;;
--no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c )
do_changelog=false
shift ;;
--local-symlink | --local-symlin | --local-symli | --local-syml | --local-sym | --local-sy | --local-s )
lsymbolic=true
shift ;;
+ -S | --more-symlinks | --more-symlink | --more-symlin | --more-symli | --more-syml | --more-sym | --more-sy | --more-s | --more- | --more | --mor | --mo )
+ symbolic=true
+ do_copyrights=
+ shift ;;
--help | --hel | --he | --h )
func_usage
func_exit $? ;;
func_exit 1
fi
if test -n "$local_gnulib_dir" || test -n "$supplied_libname" \
- || test -n "$sourcebase" || test -n "$m4base" \
+ || test -n "$sourcebase" || test -n "$m4base" || test -n "$pobase" \
|| test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \
|| test -n "$inctests" || test -n "$avoidlist" || test -n "$lgpl" \
- || test -n "$makefile_name" || test -n "$macro_prefix"; then
+ || test -n "$makefile_name" || test -n "$macro_prefix" \
+ || test -n "$po_domain"; then
echo "gnulib-tool: invalid options for 'update' mode" 1>&2
echo "Try 'gnulib-tool --help' for more information." 1>&2
echo "If you really want to modify the gnulib configuration of your project," 1>&2
fi
do_changelog=false
fi
+ if test -n "$pobase" && test -z "$po_domain"; then
+ echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2
+ echo "Try 'gnulib-tool --help' for more information." 1>&2
+ func_exit 1
+ fi
+ if test -z "$pobase" && test -n "$po_domain"; then
+ echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2
+ fi
# Determine the minimum supported autoconf version from the project's
# configure.ac.
case "$m4base" in
*/ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;;
esac
+ case "$pobase" in
+ */ ) pobase=`echo "$pobase" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
case "$docbase" in
*/ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;;
esac
case "$0" in
/*) self_abspathname="$0" ;;
*/*) self_abspathname=`pwd`/"$0" ;;
- *) for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`; do
- if test -x "$d/$0" && test ! -d "$d/$0"; then
- self_abspathname="$d/$0"
- break
- fi
- done
- if test -z "$self_abspathname"; then
- func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?"
- fi
- ;;
+ *)
+ # Look in $PATH.
+ # Iterate through the elements of $PATH.
+ # We use IFS=: instead of
+ # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`
+ # because the latter does not work when some PATH element contains spaces.
+ # We use a canonicalized $pathx instead of $PATH, because empty PATH
+ # elements are by definition equivalent to '.', however field splitting
+ # according to IFS=: loses empty fields in many shells:
+ # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
+ # beginning, at the end, and in the middle),
+ # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
+ # at the beginning and at the end,
+ # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
+ # Solaris lose empty fields at the end.
+ # The 'case' statement is an optimization, to avoid evaluating the
+ # explicit canonicalization command when $PATH contains no empty fields.
+ self_abspathname=
+ if test "${PATH_SEPARATOR+set}" != set; then
+ func_tmpdir
+ { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
+ chmod +x "$tmp"/conf.sh
+ if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -rf "$tmp"
+ fi
+ if test "$PATH_SEPARATOR" = ";"; then
+ # On Windows, programs are searched in "." before $PATH.
+ pathx=".;$PATH"
+ else
+ # On Unix, we have to convert empty PATH elements to ".".
+ pathx="$PATH"
+ case :$PATH: in
+ *::*)
+ pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'`
+ ;;
+ esac
+ fi
+ save_IFS="$IFS"
+ IFS="$PATH_SEPARATOR"
+ for d in $pathx; do
+ IFS="$save_IFS"
+ test -z "$d" && d=.
+ if test -x "$d/$0" && test ! -d "$d/$0"; then
+ self_abspathname="$d/$0"
+ break
+ fi
+ done
+ IFS="$save_IFS"
+ if test -z "$self_abspathname"; then
+ func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?"
+ fi
+ ;;
esac
while test -h "$self_abspathname"; do
# Resolve symbolic link.
-e '/^COPYING$/d' -e '/\/COPYING$/d' \
-e '/^README$/d' -e '/\/README$/d' \
-e '/^TEMPLATE$/d' \
+ -e '/^TEMPLATE-EXTENDED$/d' \
-e '/^TEMPLATE-TESTS$/d' \
-e '/^\..*/d' \
-e '/~$/d' \
&& test "COPYING" != "$module" \
&& test "README" != "$module" \
&& test "TEMPLATE" != "$module" \
+ && test "TEMPLATE-EXTENDED" != "$module" \
&& test "TEMPLATE-TESTS" != "$module"; then
# OK, $module is a correct module name.
# Verify that building the module description with 'patch' succeeds.
fi
;;
esac
+ # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/.
+ buildaux_files=`for f in $all_files; do \
+ case $f in \
+ build-aux/*) echo $f ;; \
+ esac; \
+ done | sed -e 's,^build-aux/,,'`
+ if test -n "$buildaux_files"; then
+ sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,'
+ echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"`
+ echo
+ fi
;;
esac
}
done
# Add the dummy module, to make sure the library will be non-empty.
if test -z "$have_lib_SOURCES"; then
- func_append modules " dummy"
+ if func_acceptable "dummy"; then
+ func_append modules " dummy"
+ fi
fi
}
# - local_gnulib_dir from --local-dir
# - modules list of modules, including dependencies
# - libname library name
+# - pobase directory relative to destdir where to place *.po files
# - auxdir directory relative to destdir where to place build aux files
# - makefile_name from --makefile-name
# - libtool true if libtool will be used, false or blank otherwise
# - macro_prefix prefix of gl_LIBOBJS macros to use
+# - po_domain prefix of i18n domain to use (without -gnulib suffix)
# - actioncmd (optional) command that will reproduce this invocation
# - for_test true if creating a package for testing, false otherwise
# Output:
{
func_get_automake_snippet "$module" |
sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
- -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' |
- sed -e "$sed_eliminate_LDFLAGS" |
- sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' |
- sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
- -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' |
- sed -e "$sed_transform_check_PROGRAMS"
+ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
+ -e "$sed_eliminate_LDFLAGS" \
+ -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
+ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
+ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
+ -e "$sed_transform_check_PROGRAMS"
if test "$module" = 'alloca'; then
echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)"
fi
echo
+ if test -n "$pobase"; then
+ echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\""
+ echo
+ fi
cat allsnippets.tmp \
| sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
echo
echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
echo " fi; \\"
- echo " done"
+ echo " done; \\"
+ echo " :"
rm -f allsnippets.tmp
}
+# func_emit_po_Makevars
+# emits the contents of po/ makefile parametrization to standard output.
+# Input:
+# - local_gnulib_dir from --local-dir
+# - sourcebase directory relative to destdir where to place source code
+# - pobase directory relative to destdir where to place *.po files
+# - po_domain prefix of i18n domain to use (without -gnulib suffix)
+func_emit_po_Makevars ()
+{
+ echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
+ func_emit_copyright_notice
+ echo
+ echo "# Usually the message domain is the same as the package name."
+ echo "# But here it has a '-gnulib' suffix."
+ echo "DOMAIN = ${po_domain}-gnulib"
+ echo
+ echo "# These two variables depend on the location of this directory."
+ echo "subdir = ${pobase}"
+ echo "top_builddir = "`echo "$pobase" | sed -e 's,//*,/,g' -e 's,[^/][^/]*,..,g'`
+ echo
+ cat <<\EOF
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = \
+ --keyword=_ --flag=_:1:pass-c-format \
+ --keyword=N_ --flag=N_:1:pass-c-format \
+ --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
+ --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
+ --flag=error:3:c-format --flag=error_at_line:5:c-format
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. gnulib is copyrighted by the FSF.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+EOF
+}
+
+# func_emit_po_POTFILES_in
+# emits the file list to be passed to xgettext to standard output.
+# Input:
+# - local_gnulib_dir from --local-dir
+# - sourcebase directory relative to destdir where to place source code
+# - files list of new files
+func_emit_po_POTFILES_in ()
+{
+ echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
+ func_emit_copyright_notice
+ echo
+ echo "# List of files which contain translatable strings."
+ echo "$files" | sed -n -e "s,^lib/,$sourcebase/,p"
+}
+
# func_emit_tests_Makefile_am
# emits the contents of tests makefile to standard output.
# Input:
{
func_get_automake_snippet "$module" |
sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
- -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' |
- sed -e "$sed_eliminate_LDFLAGS" |
- sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' |
- sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
- -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' |
- sed -e "$sed_transform_check_PROGRAMS"
+ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
+ -e "$sed_eliminate_LDFLAGS" \
+ -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
+ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
+ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
+ -e "$sed_transform_check_PROGRAMS"
} > amsnippet.tmp
# Skip the contents if its entirely empty.
if grep '[^ ]' amsnippet.tmp > /dev/null ; then
echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
echo " fi; \\"
- echo " done"
+ echo " done; \\"
+ echo " :"
rm -f allsnippets.tmp
}
# - libname library name
# - sourcebase directory relative to destdir where to place source code
# - m4base directory relative to destdir where to place *.m4 macros
+# - pobase directory relative to destdir where to place *.po files
# - docbase directory relative to destdir where to place doc files
# - testsbase directory relative to destdir where to place unit test code
# - auxdir directory relative to destdir where to place build aux files
# given, blank otherwise
# - guessed_libtool true if the configure.ac file uses libtool, false otherwise
# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
+# - po_domain prefix of i18n domain to use (without -gnulib suffix)
# - autoconf_minversion minimum supported autoconf version
# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if files should be symlinked, copied otherwise
# - lsymbolic true if files from local_gnulib_dir should be symlinked,
# copied otherwise
+# - do_copyrights true if copyright notices in files should be replaced,
+# blank otherwise
func_import ()
{
# Get the cached settings.
cached_avoidlist=
cached_sourcebase=
cached_m4base=
+ cached_pobase=
cached_docbase=
cached_testsbase=
+ cached_inctests=
cached_libname=
cached_lgpl=
cached_makefile_name=
cached_libtool=
cached_macro_prefix=
+ cached_po_domain=
cached_files=
if test -f "$destdir"/$m4base/gnulib-cache.m4; then
cached_libtool=false
/gl_M4_BASE(/ {
s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p
}
+ /gl_PO_BASE(/ {
+ s,^.*gl_PO_BASE([[ ]*\([^])]*\).*$,cached_pobase="\1",p
+ }
/gl_DOC_BASE(/ {
s,^.*gl_DOC_BASE([[ ]*\([^])]*\).*$,cached_docbase="\1",p
}
/gl_TESTS_BASE(/ {
s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p
}
+ /gl_WITH_TESTS/ {
+ s,^.*$,cached_inctests=true,p
+ }
/gl_LIB(/ {
s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p
}
}
/gl_MACRO_PREFIX(/ {
s,^.*gl_MACRO_PREFIX([[ ]*\([^])]*\).*$,cached_macro_prefix="\1",p
+ }
+ /gl_PO_DOMAIN(/ {
+ s,^.*gl_PO_DOMAIN([[ ]*\([^])]*\).*$,cached_po_domain="\1",p
}'
eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4`
if test -f "$destdir"/$m4base/gnulib-comp.m4; then
specified_modules="$cached_specified_modules $1"
# Append the cached and the specified avoidlist. This is probably better
# than dropping the cached one when --avoid is specified at least once.
- avoidlist=`echo $cached_avoidlist $avoidlist`
+ avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u`
+ avoidlist=`echo $avoidlist`
+
# The sourcebase defaults to the cached one.
if test -z "$sourcebase"; then
sourcebase="$cached_sourcebase"
func_fatal_error "missing --source-base option"
fi
fi
+ # The pobase defaults to the cached one.
+ if test -z "$pobase"; then
+ pobase="$cached_pobase"
+ fi
# The docbase defaults to the cached one.
if test -z "$docbase"; then
docbase="$cached_docbase"
func_fatal_error "missing --tests-base option"
fi
fi
+ # Require the tests if specified either way.
+ if test -z "$inctests"; then
+ inctests="$cached_inctests"
+ fi
# The libname defaults to the cached one.
if test -z "$supplied_libname"; then
libname="$cached_libname"
func_fatal_error "missing --macro-prefix option"
fi
fi
+ # The po_domain defaults to the cached one.
+ if test -z "$po_domain"; then
+ po_domain="$cached_po_domain"
+ fi
# Canonicalize the list of specified modules.
specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u`
for module in $modules; do
license=`func_get_license $module`
case $license in
- LGPL | 'GPLed build tool') ;;
+ LGPL | LGPLv2+ | 'GPLed build tool') ;;
'public domain' | 'unlimited' | 'unmodifiable license text') ;;
*) func_fatal_error "incompatible license on module $module: $license" ;;
esac
break
fi
done
- if test -n "$lgpl"; then
- # Update license.
- sed_transform_lib_file=$sed_transform_lib_file'
- s/GNU General/GNU Lesser General/g
- s/version 2\([ ,]\)/version 2.1\1/g
- '
+ if test -n "$do_copyrights"; then
+ if test -n "$lgpl"; then
+ # Update license.
+ sed_transform_lib_file=$sed_transform_lib_file'
+ s/GNU General/GNU Lesser General/g
+ s/version 2\([ ,]\)/version 2.1\1/g
+ '
+ fi
fi
# Determine final file list.
# Create directories.
{ echo "$sourcebase"
echo "$m4base"
+ if test -n "$pobase"; then
+ echo "$pobase"
+ fi
docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'`
if test -n "$docfiles"; then
echo "$docbase"
}
# Copy files or make symbolic links. Remove obsolete files.
+ added_files=''
+ removed_files=''
delimiter=' '
# Construct a table with 2 columns: rewritten-file-name original-file-name,
# representing the files according to the last gnulib-tool invocation.
else
echo "Remove file $g (backup in ${g}~)"
fi
+ func_append removed_files "$g$nl"
fi
done
# func_add_or_update handles a file that ought to be present afterwards.
else
echo "Copy file $g"
fi
+ func_append added_files "$g$nl"
fi
rm -f "$tmpfile"
}
func_append actioncmd " --lib=$libname"
func_append actioncmd " --source-base=$sourcebase"
func_append actioncmd " --m4-base=$m4base"
+ if test -n "$pobase"; then
+ func_append actioncmd " --po-base=$pobase"
+ fi
func_append actioncmd " --doc-base=$docbase"
func_append actioncmd " --aux-dir=$auxdir"
+ if test -n "$inctests"; then
+ func_append actioncmd " --with-tests"
+ fi
for module in $avoidlist; do
func_append actioncmd " --avoid=$module"
done
func_append actioncmd " --no-libtool"
fi
func_append actioncmd " --macro-prefix=$macro_prefix"
+ if test -n "$po_domain"; then
+ func_append actioncmd " --po-domain=$po_domain"
+ fi
func_append actioncmd " `echo $specified_modules`"
# Default the makefile name to Makefile.am.
echo "Create $sourcebase/$makefile_am"
rm -f "$tmpfile"
fi
+ func_append added_files "$sourcebase/$makefile_am$nl"
+ fi
+
+ # Create po/ directory.
+ if test -n "$pobase"; then
+ # Create po makefile and auxiliary files.
+ for file in Makefile.in.in remove-potcdate.sin; do
+ func_dest_tmpfilename $pobase/$file
+ func_lookup_file build-aux/po/$file
+ cat "$lookedup_file" > "$tmpfile"
+ if test -f "$destdir"/$pobase/$file; then
+ if cmp "$destdir"/$pobase/$file "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
+ else
+ if $doit; then
+ echo "Updating $pobase/$file (backup in $pobase/$file~)"
+ mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~
+ mv -f "$tmpfile" "$destdir"/$pobase/$file
+ else
+ echo "Update $pobase/$file (backup in $pobase/$file~)"
+ rm -f "$tmpfile"
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $pobase/$file"
+ mv -f "$tmpfile" "$destdir"/$pobase/$file
+ else
+ echo "Create $pobase/$file"
+ rm -f "$tmpfile"
+ fi
+ func_append added_files "$pobase/$file$nl"
+ fi
+ done
+ # Create po makefile parametrization, part 1.
+ func_dest_tmpfilename $pobase/Makevars
+ func_emit_po_Makevars > "$tmpfile"
+ if test -f "$destdir"/$pobase/Makevars; then
+ if cmp "$destdir"/$pobase/Makevars "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
+ else
+ if $doit; then
+ echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)"
+ mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~
+ mv -f "$tmpfile" "$destdir"/$pobase/Makevars
+ else
+ echo "Update $pobase/Makevars (backup in $pobase/Makevars~)"
+ rm -f "$tmpfile"
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $pobase/Makevars"
+ mv -f "$tmpfile" "$destdir"/$pobase/Makevars
+ else
+ echo "Create $pobase/Makevars"
+ rm -f "$tmpfile"
+ fi
+ func_append added_files "$pobase/Makevars$nl"
+ fi
+ # Create po makefile parametrization, part 2.
+ func_dest_tmpfilename $pobase/POTFILES.in
+ func_emit_po_POTFILES_in > "$tmpfile"
+ if test -f "$destdir"/$pobase/POTFILES.in; then
+ if cmp "$destdir"/$pobase/POTFILES.in "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
+ else
+ if $doit; then
+ echo "Updating $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)"
+ mv -f "$destdir"/$pobase/POTFILES.in "$destdir"/$pobase/POTFILES.in~
+ mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
+ else
+ echo "Update $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)"
+ rm -f "$tmpfile"
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $pobase/POTFILES.in"
+ mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
+ else
+ echo "Create $pobase/POTFILES.in"
+ rm -f "$tmpfile"
+ fi
+ func_append added_files "$pobase/POTFILES.in$nl"
+ fi
+ # Fetch PO files.
+ TP_URL="http://translationproject.org/latest/"
+ if $doit; then
+ echo "Fetching gnulib PO files from $TP_URL"
+ (cd "$destdir"/$pobase \
+ && wget --quiet -r -l1 -nd -np -A.po "${TP_URL}gnulib"
+ )
+ else
+ echo "Fetch gnulib PO files from $TP_URL"
+ fi
+ # Create po/LINGUAS.
+ if $doit; then
+ func_dest_tmpfilename $pobase/LINGUAS
+ (cd "$destdir"/$pobase \
+ && { echo '# Set of available languages.'
+ LC_ALL=C ls -1 *.po | sed -e 's,\.po$,,'
+ }
+ ) > "$tmpfile"
+ if test -f "$destdir"/$pobase/LINGUAS; then
+ if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
+ else
+ echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
+ mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~
+ mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
+ fi
+ else
+ echo "Creating $pobase/LINGUAS"
+ mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
+ func_append added_files "$pobase/LINGUAS$nl"
+ fi
+ else
+ if test -f "$destdir"/$pobase/LINGUAS; then
+ echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
+ else
+ echo "Create $pobase/LINGUAS"
+ fi
+ fi
fi
# Create m4/gnulib-cache.m4.
echo "gl_AVOID([$avoidlist])"
echo "gl_SOURCE_BASE([$sourcebase])"
echo "gl_M4_BASE([$m4base])"
+ echo "gl_PO_BASE([$pobase])"
echo "gl_DOC_BASE([$docbase])"
echo "gl_TESTS_BASE([$testsbase])"
+ test -z "$inctests" || echo "gl_WITH_TESTS"
echo "gl_LIB([$libname])"
test -z "$lgpl" || echo "gl_LGPL"
echo "gl_MAKEFILE_NAME([$makefile_name])"
echo "gl_LIBTOOL"
fi
echo "gl_MACRO_PREFIX([$macro_prefix])"
+ echo "gl_PO_DOMAIN([$po_domain])"
) > "$tmpfile"
if test -f "$destdir"/$m4base/gnulib-cache.m4; then
if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then
s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
ba
}'
- sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
else
sed_replace_build_aux=
fi
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the dependencies.
if test "$libtool" != true; then
- libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+ libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
echo " AC_SUBST([${libname_upper}_LIBDEPS])"
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
echo "Create $testsbase/$makefile_am"
rm -f "$tmpfile"
fi
+ func_append added_files "$testsbase/$makefile_am$nl"
fi
fi
+ # Update the .cvsignore and .gitignore files.
+ { echo "$added_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|A|\1,'
+ echo "$removed_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|R|\1,'
+ } | LC_ALL=C sort -t'|' -k1,1 > "$tmp"/fileset-changes
+ { # Rearrange file descriptors. Needed because "while ... done < ..."
+ # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
+ exec 5<&0 < "$tmp"/fileset-changes
+ func_update_ignorelist ()
+ {
+ ignore="$1"
+ if test -f "$destdir/$dir$ignore"; then
+ if test -n "$dir_added" || test -n "$dir_removed"; then
+ LC_ALL=C sort "$destdir/$dir$ignore" > "$tmp"/ignore
+ echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \
+ | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-added
+ echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \
+ | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-removed
+ if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then
+ if $doit; then
+ echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)"
+ mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~
+ sed -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed > "$tmp"/sed-ignore-removed
+ cat "$destdir/$dir$ignore"~ "$tmp"/ignore-added \
+ | sed -f "$tmp"/sed-ignore-removed \
+ > "$destdir/$dir$ignore"
+ else
+ echo "Update $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)"
+ fi
+ fi
+ fi
+ else
+ if test -n "$dir_added"; then
+ if $doit; then
+ echo "Creating $destdir/$dir$ignore"
+ echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u > "$destdir/$dir$ignore"
+ else
+ echo "Create $destdir/$dir$ignore"
+ fi
+ fi
+ fi
+ }
+ func_done_dir ()
+ {
+ dir="$1"
+ dir_added="$2"
+ dir_removed="$3"
+ if test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then
+ func_update_ignorelist .cvsignore
+ fi
+ if test -d "$destdir/.git" || test -f "$destdir/${dir}.gitignore"; then
+ func_update_ignorelist .gitignore
+ fi
+ }
+ last_dir=
+ last_dir_added=
+ last_dir_removed=
+ while read line; do
+ # Why not ''read next_dir op file'' ? Because the dir column can be empty.
+ next_dir=`echo "$line" | sed -e 's,|.*,,'`
+ op=`echo "$line" | sed -e 's,^[^|]*|\([^|]*\)|.*$,\1,'`
+ file=`echo "$line" | sed -e 's,^[^|]*|[^|]*|,,'`
+ if test "$next_dir" != "$last_dir"; then
+ func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed"
+ last_dir="$next_dir"
+ last_dir_added=
+ last_dir_removed=
+ fi
+ case $op in
+ A) func_append last_dir_added "$file$nl";;
+ R) func_append last_dir_removed "$file$nl";;
+ esac
+ done
+ func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed"
+ exec 0<&5 5<&-
+ }
+
echo "Finished."
echo
echo "You may need to add #include directives for the following .h files."
else
echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\","
fi
+ if test -n "$pobase"; then
+ echo " - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac,"
+ fi
if test -n "$inctests"; then
if test "$makefile_am" = Makefile.am; then
echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
sourcebase_base=`basename "$sourcebase"`
echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am,"
fi
+ if test -n "$pobase"; then
+ pobase_dir=`echo "$pobase" | sed -n -e 's,/[^/]*$,/,p'`
+ pobase_base=`basename "$pobase"`
+ echo " - mention \"${pobase_base}\" in SUBDIRS in ${pobase_dir}Makefile.am,"
+ fi
if test -n "$inctests"; then
if test "$makefile_am" = Makefile.am; then
testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'`
func_modules_transitive_closure
for module in $modules; do
license=`func_get_license "$module"`
- case $license in
- LGPL | 'GPLed build tool') ;;
+ case "$license" in
+ 'GPLed build tool') ;;
'public domain' | 'unlimited' | 'unmodifiable license text') ;;
- *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+ *)
+ case "$requested_license" in
+ GPLv2+)
+ case "$license" in
+ GPLv2+ | LGPLv2+) ;;
+ *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+ esac
+ ;;
+ LGPL)
+ case "$license" in
+ LGPL | LGPLv2+) ;;
+ *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+ esac
+ ;;
+ LGPLv2+)
+ case "$license" in
+ LGPLv2+) ;;
+ *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+ esac
+ ;;
+ esac
+ ;;
esac
done
fi
# Subdirectory names.
sourcebase=gllib
m4base=glm4
+ pobase=
docbase=gldoc
testsbase=gltests
macro_prefix=gl
+ po_domain=
# Determine final module list.
func_modules_transitive_closure
sed_replace_build_aux='
:a
/AC_CONFIG_FILES(.*:build-aux\/.*)/{
- s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
- ba
+ s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
+ ba
}'
- sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
# We don't have explicit ordering constraints between the various
# autoconf snippets. It's cleanest to put those of the library before
# those of the tests.
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the dependencies.
if test "$libtool" != true; then
- libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+ libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
echo " AC_SUBST([${libname_upper}_LIBDEPS])"
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
ba
}'
- sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
else
sed_replace_build_aux=
fi
# _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
# created using libtool, because libtool already handles the dependencies.
if test "$libtool" != true; then
- libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'`
+ libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'`
echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
echo " AC_SUBST([${libname_upper}_LIBDEPS])"
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
echo "executing ${AUTOPOINT} --force"
${AUTOPOINT} --force || func_exit 1
for f in ../$m4base/*.m4~; do
- mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
+ mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
done
fi
echo "executing ${ACLOCAL} -I ../$m4base"
# distributed (such as getdate.c).
# Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...".
cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
- | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'`
+ | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'`
cleaned_files=`for file in $cleaned_files; do echo " $file "; done`
# Extract the value of "BUILT_SOURCES += ...". Remove variable references
# such $(FOO_H) because they don't refer to distributed files.
sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g'
built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
- | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \
+ | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \
| sed -e "$sed_remove_make_variables"`
distributed_built_sources=`for file in $built_sources; do
case "$cleaned_files" in
-e 's,October,10,' -e 's,Oct,10,' \
-e 's,November,11,' -e 's,Nov,11,' \
-e 's,December,12,' -e 's,Dec,12,' \
- | sed -e 's,^,00,' | sed -e 's,^[0-9]*\([0-9][0-9] \),\1,' \
- | sed -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'`
+ -e 's,^,00,' -e 's,^[0-9]*\([0-9][0-9] \),\1,' \
+ -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'`
(echo '#!/bin/sh'
echo "CVSDATE=$cvsdate"
echo "test -d logs || mkdir logs"
echo " : autobuild revision... cvs-\$CVSDATE-000000"
echo " : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`"
echo " : autobuild hostname... \`hostname\`"
- echo " cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check"
+ echo " cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check && make distclean"
echo " echo rc=\$?"
echo " ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule"
echo "done"
- ) > "$megatestdir/autobuild"
- chmod a+x "$megatestdir/autobuild"
+ ) > "$megatestdir/do-autobuild"
+ chmod a+x "$megatestdir/do-autobuild"
# Create Makefile.am.
(echo "## Process this file with automake to produce Makefile.in."
echo
echo "SUBDIRS = $megasubdirs"
echo
- echo "EXTRA_DIST = autobuild"
+ echo "EXTRA_DIST = do-autobuild"
) > "$megatestdir/Makefile.am"
# Create configure.ac.
for m4base in $m4dirs; do
# Perform func_import in a subshell, so that variable values
# such as
- # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase,
- # testsbase, libname, lgpl, makefile_name, libtool, macro_prefix
+ # local_gnulib_dir, avoidlist, sourcebase, m4base, pobase,
+ # docbase, testsbase, inctests, libname, lgpl, makefile_name,
+ # libtool, macro_prefix, po_domain
# don't propagate from one directory to another.
(func_import) || func_exit 1
done
projects / gnulib.git / blobdiff