no need for old reautoconf?

git-svn-id: svn://tug.org/texlive/trunk@1602 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 97 insertions, 99 deletions

diff --git a/Build/source/reautoconf b/Build/source/reautoconf
index a41e0b6ad72..bc912de65cb 100755
--- a/Build/source/reautoconf
+++ b/Build/source/reautoconf
@@ -1,111 +1,109 @@
-#!/bin/sh
+#! /bin/sh
 
-echo .
-autoconf -m texk/etc/autoconf
-sed -e 's@--enable-multiplatform.*put executables in bin/PLATFORM@--disable-multiplatform     put executables in bin instead of bin/PLATFORM@' \
-    -e 's@window-capable METAFONT is mfw@window-capable METAFONT is mfw (default)@' \
-    -e 's@--with-cxx-runtime-hack.*runtime statically@--without-cxx-runtime-hack do not link C++ runtime statically@' \
-  < configure > configure_tmp$$
-cat configure_tmp$$ > configure; rm configure_tmp$$
-
-dir=libs
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../texk/etc/autoconf)
-
-# Don't pass --cache-file argument to avoid running different autoconf
-# versions with a common cache.
-for f in configure libs/configure; do
-  sed 's@ac_sub_configure_args --cache-file=.ac_sub_cache_file@ac_sub_configure_args@' < $f > configure_tmp$$
-  cat configure_tmp$$ > $f
-  rm -f configure_tmp$$
-done
-
-dir=texk
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m etc/autoconf)
+# A replacement for the "reautoconf" script found at the root of the
+# web2c/teTeX/TeX-Live tree Used to run autoconf Versions 2.13 (old)
+# resp. 2.59 (new) in various directories.  Adapted from Peter
+# Breitenlohner's original version.
+#
+# Copyright 2005 Olaf Weber.
+# Copyright 2004 Peter Breitenlohner.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dir=utils/dialog
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf)
+[ -f ./texk/make/common.mk ] || {
+	echo "*** can't find ./texk/make/common.mk"
+	exit 1
+}
 
-dir=utils/t1utils
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf)
+# Remember the topdir.
+topdir=`pwd`
 
-dir=utils/texinfo
-  (test -d $dir || exit; cd $dir; echo $dir; automake -i Makefile doc/Makefile lib/Makefile makeinfo/Makefile util/Makefile; autoconf; touch aclocal.m4 ; touch Makefile.in;
- touch stamp-h.in; touch configure)
+# "acold" runs autoconf-2.13
+# "acnew" runs autoconf-2.59
 
-dir=libs/ncurses
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../../texk/etc/autoconf)
+acold () {	# $dir=current
+	echo "    Running autoconf-2.13 in \`$dir'"
+	$topdir/texk/autoconf2.13 -m "$topdir/texk/etc/autoconf"
+}
 
-# just to remember...
-#ed libs/ncurses/configure >/dev/null <<'eof'
-#1a
+# For autoconf-2.59 two things have to be done:
+#
+# 1. Rebuild aclocal.m4, using a patched version of aclocal-1.9.5.
 #
-## added by Thomas Esser for teTeX to work around a bug in MacOS X (darwin):
-#test "x$NCURSES_CPP_FIX" = xtrue \
-#  && { CPPFLAGS="-no-cpp-precomp $CPPFLAGS"; export CPPFLAGS; }
+# The patches (as obtained from one of the automake maintainers)
+# can be found in
+#	ftp://ftpth.mppmu.mpg.de/pub/peb/web2c/autoconf/aclocal.patch
+# and should be part of the next release, i.e., automake-1.9.6.
 #
-#.
-#w
-#q
-#eof
+# Obviously directories that come with a prebuilt aclocal.m4, but without
+# the ingredients to rebuild it, need special treatment.
+#
+# 2. Run /usr/local/bin/autoconf
 
+###################################
+# The patch quoted above fixes only part of the sinclude problems.
+# The generated aclocal.m4 still contains erroneous m4_include's
+# that have to be removed before running autoconf.
+###################################
 
-dir=libs/libwww
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../../texk/etc/autoconf)
-dir=libs/xpdf
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../../texk/etc/autoconf)
+acnew () {	# $dir=current, $dir/$rdir->./texk/m4 with the KPSE macros.
+	#arg="-I $rdir"
+	#[ -n "$1" ] && {
+	#	# Move existing aclocal.m4 into subdir and build new one
+	#	mkdir m4
+	#	mv aclocal.m4 m4/oldlocal.m4
+	#	arg="-I m4 $arg"
+	#}
+	#echo "Running aclocal-1.9 (patched) in \`$dir'"
+	#$topdir/config/aclocal-1.9peb --force $arg || return
+	echo "    Running autoconf-2.59 in \`$dir'"
+	/usr/bin/autoconf2.50 --force || return
+	#rm -rf autom4te.cache
+}
 
-dir=libs/t1lib
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../../texk/etc/autoconf)
-dir=libs/type1
-  (test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../../texk/etc/autoconf)
+# Autoconf in .
+dir=. rdir=texk/m4
+acold
 
-dir=texk/bibtex8
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/chktex
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/devnag
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/dtl
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/dvidvi
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/dviljk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/dvipdfm
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/dvipsk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/gsftopk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/ispell
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/kpathsea
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/lacheck
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/makeindexk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/musixflx
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/owindvi
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/ps2pkm
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/seetexk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/tetex
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/tex4htk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/texlive
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/ttf2pk
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/ttfdump
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/web2c
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/windvi
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
-dir=texk/xdvik
-(test -d $dir || exit; cd $dir; echo $dir; autoconf -m ../etc/autoconf)
+# Autoconf in all other directories
+for dir in `find utils libs texk -name configure.in | sed 's,/configure.in$,,'`; do
+	case $dir in
+		*/texi*)	# texinfo and texi2html are automade
+		;;
+		*/ncurses)	# ncurses has it's own special configure
+		;;
+		utils/*)	# Skip everything in utils for now.
+		;;
+		*/curl)		# Is automade.
+		;;
+		texk)	rdir=m4
+			(cd $dir; acold)
+		;;
+		texk/*)	rdir=`echo $dir | sed -e 's,^texk/,,' -e 's,[^/]*,..,g'`/m4
+			case $dir in
+				*/dvipng|*/devnag|*/dvipdfmx)
+					(cd $dir; acnew);;
+				*)	(cd $dir; acold);;
+			esac
+		;;
+		*)	rdir=`echo $dir | sed 's,[^/]*,..,g'`/texk/m4
+			case $dir in
+			*/t1utils|*/lcdf-typetools|*/curl|*/expat)
+				(cd $dir; acnew) ;;
+			*)	(cd $dir; acold) ;;
+			esac
+		;;
+	esac
+done