progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-10-12 11:43:46 $'
+cvsdatestamp='$Date: 2006-10-20 13:42:39 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
# You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
AUTOMAKEPATH=
+# You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
+GETTEXTPATH=
+
# If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
-# variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually.
+# variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
AUTOCONF="${AUTOCONFPATH}autoconf"
fi
+if test -z "${AUTOHEADER}" || test -n "${AUTOCONFPATH}"; then
+ AUTOHEADER="${AUTOCONFPATH}autoheader"
+fi
if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then
ACLOCAL="${AUTOMAKEPATH}aclocal"
fi
AUTORECONF="${AUTOCONFPATH}autoreconf"
fi
+# If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT.
+if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then
+ AUTOPOINT="${GETTEXTPATH}autopoint"
+fi
+
# GNU sort is needed. Set SORT to its location (not needed if it's called
# 'sort' and already in the PATH).
if test -z "$SORT"; then
# m4base (to avoid an error in func_import) and optional for the others.
sed_trimtrailingslashes='s,\([^/]\)//*$,\1,'
case "$local_gnulib_dir" in
- */ ) sourcebase=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;;
+ */ ) local_gnulib_dir=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;;
esac
case "$sourcebase" in
*/ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;;
{
func_lookup_file "modules/$1"
sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file"
+ case "$1" in
+ *-tests)
+ # *-tests module live in tests/, not lib/.
+ ;;
+ *)
+ # Synthesize an EXTRA_DIST augmentation.
+ sed_combine_lines='/\\$/{
+ :a
+ N
+ s/\\\
+//
+ s/\\$/\\/
+ ta
+ }'
+ sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p'
+ already_mentioned_files=` \
+ sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \
+ | sed -e "$sed_combine_lines" \
+ | sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'`
+ all_files=`func_get_filelist $1`
+ lib_files=`for f in $all_files; do \
+ case $f in \
+ lib/*) echo $f ;; \
+ esac; \
+ done | sed -e 's,^lib/,,'`
+ # Remove $already_mentioned_files from $lib_files.
+ echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files
+ extra_files=`for f in $already_mentioned_files; do echo $f; done \
+ | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/lib-files`
+ if test -n "$extra_files"; then
+ echo "EXTRA_DIST +=" $extra_files
+ echo
+ fi
+ ;;
+ esac
}
# func_get_include_directive module
# - libname library name
# - 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
# - actioncmd (optional) command that will reproduce this invocation
func_emit_lib_Makefile_am ()
{
-e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g'
if test "$module" = 'alloca'; then
echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
+ echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
fi
} > amsnippet.tmp
# Skip the contents if its entirely empty.
echo "${libname}_${libext}_SOURCES ="
# Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However,
# automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@.
- echo "${libname}_${libext}_LIBADD = \$(${perhapsLT}LIBOBJS)"
+ echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
+ echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
if test "$libtool" = true; then
echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)"
fi
rm -f allsnippets.tmp
}
+# func_emit_initmacro_start
+# emits the first few statements of the gl_INIT macro to standard output.
+# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
+func_emit_initmacro_start ()
+{
+ echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix}_LIBOBJ]))"
+ echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix}_REPLACE_FUNCS]))"
+}
+
+# func_emit_initmacro_end
+# emits the last few statements of the gl_INIT macro to standard output.
+# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
+func_emit_initmacro_end ()
+{
+ echo " m4_popdef([AC_REPLACE_FUNCS])"
+ echo " m4_popdef([AC_LIBOBJ])"
+ echo " AC_CONFIG_COMMANDS_PRE(["
+ echo " ${macro_prefix}_libobjs="
+ echo " ${macro_prefix}_ltlibobjs="
+ echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then"
+ echo " # Remove the extension."
+ echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'"
+ echo " for i in \`for i in \$${macro_prefix}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do"
+ echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\""
+ echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\""
+ echo " done"
+ echo " fi"
+ echo " AC_SUBST([${macro_prefix}_LIBOBJS], [\$${macro_prefix}_libobjs])"
+ echo " AC_SUBST([${macro_prefix}_LTLIBOBJS], [\$${macro_prefix}_ltlibobjs])"
+ echo " ])"
+}
+
+# func_emit_initmacro_done
+# emits a few statements after the gl_INIT macro to standard output.
+# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
+func_emit_initmacro_done ()
+{
+ echo
+ echo "# Like AC_LIBOBJ, except that the module name goes"
+ echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
+ echo "AC_DEFUN([${macro_prefix}_LIBOBJ],"
+ echo " [${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS \$1.\$ac_objext\"])"
+ echo
+ echo "# Like AC_REPLACE_FUNCS, except that the module name goes"
+ echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
+ echo "AC_DEFUN([${macro_prefix}_REPLACE_FUNCS],"
+ echo " [AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])])"
+}
+
# func_import modules
# Uses also the variables
# - destdir target directory
echo "AC_DEFUN([${macro_prefix}_EARLY],"
echo "["
echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
- echo " m4_pattern_allow([^gl_ES$])dnl a valid locale name"
+ echo " m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
+ echo " m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
+ echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
echo " AC_REQUIRE([AC_PROG_RANLIB])"
if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
echo " AC_REQUIRE([AC_GNU_SOURCE])"
echo "# \"Check for header files, types and library functions\"."
echo "AC_DEFUN([${macro_prefix}_INIT],"
echo "["
+ func_emit_initmacro_start
if test "$libtool" = true; then
echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
echo " gl_cond_libtool=true"
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
fi
+ func_emit_initmacro_end
echo "])"
+ func_emit_initmacro_done
echo
echo "# This macro records the list of files which have been installed by"
echo "# gnulib-tool and may be removed by future gnulib-tool invocations."
# All modules together.
# Except config-h, which breaks all modules which use HAVE_CONFIG_H.
# Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
+ # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME.
modules=`func_all_modules`
- modules=`for m in $modules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done`
+ modules=`for m in $modules; do case $m in config-h | fnmatch-posix | ftruncate | mountlist) ;; *) echo $m;; esac; done`
fi
modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u`
m4base=glm4
docbase=gldoc
testsbase=gltests
+ macro_prefix=gl
# Determine final module list.
func_modules_transitive_closure
subdirs="$sourcebase $m4base"
subdirs_with_configure_ac=""
- if test -f "$testdir"/$m4base/gettext.m4; then
+ if false && test -f "$testdir"/$m4base/gettext.m4; then
# Avoid stupid error message from automake:
# "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
mkdir -p "$testdir/po"
# expansion of the required macro before the current point, and only one
# expansion total).
echo "AC_DEFUN([gl_INIT], ["
+ func_emit_initmacro_start
if test "$auxdir" != "build-aux"; then
sed_replace_build_aux='
:a
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
fi
+ func_emit_initmacro_end
echo "])"
+ func_emit_initmacro_done
+ echo
echo "gl_INIT"
echo
# Usually $testsbase/config.h will be a superset of config.h. Verify this
echo "AC_PROG_MAKE_SET"
echo
echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
- echo "m4_pattern_allow([^gl_ES$])dnl a valid locale name"
+ echo "m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
+ echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
+ echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
echo
echo "AC_PROG_RANLIB"
echo
# expansion of the required macro before the current point, and only one
# expansion total).
echo "AC_DEFUN([gl_INIT], ["
+ func_emit_initmacro_start
if test "$auxdir" != "build-aux"; then
sed_replace_build_aux='
:a
echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
fi
+ func_emit_initmacro_end
echo "])"
+ func_emit_initmacro_done
+ echo
echo "gl_INIT"
echo
if test -n "$subdirs_with_configure_ac"; then
# Create autogenerated files.
(cd "$testdir"
- echo "executing ${AUTORECONF} --force --install"
- ${AUTORECONF} --force --install
+ # Do not use "${AUTORECONF} --force --install", because it may invoke
+ # autopoint, which brings in older versions of some of our .m4 files.
+ if test -f $m4base/gettext.m4; then
+ echo "executing ${AUTOPOINT} --force"
+ ${AUTOPOINT} --force
+ for f in $m4base/*.m4~; do
+ mv $f `echo $f | sed -e 's,~$,,'`
+ done
+ fi
+ echo "executing ${ACLOCAL} --force -I $m4base"
+ ${ACLOCAL} --force -I $m4base
+ if ! test -d build-aux; then
+ echo "executing mkdir build-aux"
+ mkdir build-aux
+ fi
+ echo "executing ${AUTOCONF} --force"
+ ${AUTOCONF} --force
+ echo "executing ${AUTOHEADER} --force"
+ ${AUTOHEADER} --force
+ echo "executing ${AUTOMAKE} --add-missing --copy --force-missing"
+ ${AUTOMAKE} --add-missing --copy --force-missing
)
if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > /dev/null; then
(cd "$testdir"
projects / gnulib.git / blobdiff