Release 1.3.

[cdecl99.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index ef46efa59b22d522ea2995412cfe485e268e37c2..639e6c422526d5eead51ca1f946f85690930372c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -33,7 +33,7 @@ if test -x $GNULIB/gnulib-tool; then
   exec 3>lib/symfiles.tmp 4<lib/symfiles.tmp
   rm -f lib/symfiles.tmp
 
-  shared_modules='lock tls'
+  shared_modules='threadlib'
   set x --extract-recursive-dependencies $shared_modules; shift
   (set -x; $GNULIB/gnulib-tool "$@" >&3 ) || die "gnulib-tool failed"
   shared_modules=`LC_ALL=C sort -u <&4`
@@ -60,12 +60,6 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib 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