Sync the bootstrap script to include updates from other packages,
and pull in fix-gnulib and fix-ltdl updates from dxcommon.
Stub out the silly warning flags configure test found in the
latest gnulib.
-Makefile
-Makefile.in
-.libs
+.libs
+/INSTALL
+/Makefile
+/Makefile.in
/aclocal.m4
/autom4te.cache
/aclocal.m4
/autom4te.cache
+/compile
+/config.*
+/configure
+/depcomp
+/exported.sh
+/install-sh
+/lib
+/libtool
+/libuobject.pc
-/stamp-h1
-/compile
-/libuobject.pc
-/lib
-# Copyright © 2011-2012, 2015 Nick Bowler
+# Copyright © 2011-2012, 2015, 2021-2022 Nick Bowler
#
# Simple script to get started from a fresh git checkout.
#
#
# Simple script to get started from a fresh git checkout.
#
-err() {
- printf '%s: %s\n' "$scriptname" "$@" 1>&2
-}
-
-die() {
- err "$@"
- exit 1
-}
+err() { printf '%s: %s\n' "$scriptname" "$*" 1>&2; }
+die() { err "$@"; exit 1; }
: ${LIBTOOLIZE=libtoolize}
: ${AUTORECONF=autoreconf}
: ${LIBTOOLIZE=libtoolize}
: ${AUTORECONF=autoreconf}
: ${GNULIB=gnulib}
: ${GIT=git}
: ${PERL=perl}
: ${GNULIB=gnulib}
: ${GIT=git}
: ${PERL=perl}
$GIT submodule update --init || err "Failed to update submodules from git."
if test -x $GNULIB/gnulib-tool; then
$GIT submodule update --init || err "Failed to update submodules from git."
if test -x $GNULIB/gnulib-tool; then
- $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
+ $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
- die "Gnulib sources are not properly installed in gnulib/."
+ err "Gnulib sources are not properly installed in $GNULIB/"
+ cat >&2 <<'EOF'
+
+To bootstrap this package using an external Gnulib, you can set the GNULIB
+environment variable to indicate the location of the Gnulib sources.
+EOF
+
+ test ! -f configure || cat >&2 <<'EOF'
+
+However, it seems this package is already bootstrapped. It should not
+normally be necessary to run this script from a release tarball.
+EOF
+ exit 1
fi
$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
fi
$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
- || die "Failed to fixup Gnulib makefile fragment."
+ || die "Failed to fixup Gnulib makefile fragment."
# Frustratingly, libtoolize has changed the name of its nonrecursive ltdl
# makefile output, which broke all packages depending on previous documented
# Frustratingly, libtoolize has changed the name of its nonrecursive ltdl
# makefile output, which broke all packages depending on previous documented
$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \
|| die "Failed to fixup libltdl makefile fragment."
$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \
|| die "Failed to fixup libltdl makefile fragment."
+# Rewrite if ! ... construts produced by gnulib conditional dependencies
+# as these fail in heirloom-sh.
+sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
+ m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
+mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
+
# Punt some automake-generated files so that Gentoo's wrapper script doesn't
# try to detect the automake version in use.
rm -f Makefile.in aclocal.m4
# Punt some automake-generated files so that Gentoo's wrapper script doesn't
# try to detect the automake version in use.
rm -f Makefile.in aclocal.m4
-LIBTOOLIZE=true $AUTORECONF -fis
+LIBTOOLIZE=true $AUTORECONF -fis || exit
+
+amdir=`$AUTOMAKE --print-libdir`
+if test -f "$amdir/INSTALL"; then
+ ln -sf "$amdir/INSTALL" INSTALL
+fi
-Subproject commit 03a26752c80546ac8cf8fc81807bb5a153786599
+Subproject commit a7cabb5d0f067e78afd029d8ec41d14660d8f9e2
dnl This is free software: you are free to do what the fuck you want to.
dnl There is NO WARRANTY, to the extent permitted by law.
dnl This is free software: you are free to do what the fuck you want to.
dnl There is NO WARRANTY, to the extent permitted by law.
+dnl remove pointless gnulib warning flag check
+AC_DEFUN([gl_CC_GNULIB_WARNINGS])
+
AC_INIT([upkg],[0.1],[nbowler@draconx.ca])
AC_CONFIG_SRCDIR([src/libupkg.c])
AC_CONFIG_HEADERS([config.h])
AC_INIT([upkg],[0.1],[nbowler@draconx.ca])
AC_CONFIG_SRCDIR([src/libupkg.c])
AC_CONFIG_HEADERS([config.h])