fix for current automake, drop support of legacy autotools

* ./cvsignore: Amended several .cvsignore files and
  removed *.gmo, acinclude.m4 and stamp-h.in from the root one.
* m4/init.m4: Nuked, it was breaking current automake.
* m4/Makefile.m4: Removed init.m4.
* autogen.m4: Drop support for legacy autoconf; tell whether the
  auto tools exited successfully or not; fix the permissions of
  tests/*.sh--CVS doesn't provide a way to fix it.

9 files changed, 42 insertions, 128 deletions

diff --git a/.cvsignore b/.cvsignore
index 3c11108a..3bcb9f6f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,13 +1,12 @@
-*.gmo
 Makefile
 Makefile.in
 aclocal.m4
-acinclude.m4
+autom4te.cache
 configure
 config.cache
 config.h
 config.hin
 config.log
 config.status
-stamp-h.in
 stamp-h 
+stamp-h1
diff --git a/ChangeLog b/ChangeLog
index 80ed31b3..e709f5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2004-11-20  Stepan Kasal  <kasal@ucw.cz>
+
+	* ./cvsignore: Amended several .cvsignore files and
+	  removed *.gmo, acinclude.m4 and stamp-h.in from the root one.
+	* m4/init.m4: Nuked, it was breaking current automake.
+	* m4/Makefile.m4: Removed init.m4.
+	* autogen.m4: Drop support for legacy autoconf; tell whether the
+	  auto tools exited successfully or not; fix the permissions of
+	  tests/*.sh--CVS doesn't provide a way to fix it.
+
 2004-11-19  Stepan Kasal  <kasal@ucw.cz>
 
-	* src/dfa.c: Remove old version of gofast patch, from 2003-05-30.
+	* src/dfa.c: Removed old version of gofast patch, from 2003-05-30.
 	* src/search.c (check_multibyte_string): Likewise.
 
 2004-11-19  Stepan Kasal  <kasal@ucw.cz>
diff --git a/autogen.sh b/autogen.sh
index 389d3a08..ded96126 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,34 +1,16 @@
 #!/bin/sh
-# We want to support both legacy and current autoconf - this is a bit ugly...
-AC_VERSION=`autoconf --version 2>&1 |head -n1 |sed -e "s/.* //;s/\.//;s/[a-z]//"`
-if test -z "$AC_VERSION"; then
-	echo "Warning: Couldn't determine autoconf version. Assuming a current version."
-	AC_VERSION=252
-fi
-if test "$AC_VERSION" -lt 250; then
-	rm -f acinclude.m4
-	echo "#undef ssize_t" >acconfig.h
-	for i in m4/*.m4; do
-		if cat $i |grep -q "jm_"; then
-			cat $i >>acinclude.m4
-		elif test ! -e `aclocal --print-ac-dir`/`basename $i`; then
-			cat $i >>acinclude.m4
-		fi
-	done
-	aclocal
+
+chmod +x tests/*.sh   # fix a bug in CVS
+
+if \
+aclocal -I m4 &&
+autoheader &&
+automake -a &&
+autoconf
+then
+	echo "Next, run ./configure && make && make check"
 else
-	aclocal -I m4
+	echo
+	echo "An error occured."
+	exit 1
 fi
-autoheader
-automake -a
-if test "$AC_VERSION" -lt 250; then
-	# Workaround for a bug in ancient versions of autoheader
-	sed -e 's,#undef $,/* your autoheader is buggy */,g' config.hin >config.hin.new
-	rm config.hin
-	mv config.hin.new config.hin
-	# Make sure config.hin doesn't get rebuilt after the workaround
-	sed -e 's,@AUTOHEADER@,true,' Makefile.in >Makefile.in.new
-	rm Makefile.in
-	mv Makefile.in.new Makefile.in
-fi
-autoconf
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 5afd45c4..99a9b4d9 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,4 +1,7 @@
 Makefile
 Makefile.in
-version.texi
+egrep.1
+fgrep.1
 grep.info
+stamp-vti
+version.texi
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 28438a45..6ac7e494 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = decl.m4 \
              gettext.m4 \
              glibc.m4 \
              header.m4 \
-             init.m4 \
              install.m4 \
              inttypes_h.m4 \
              isc-posix.m4 \
diff --git a/m4/init.m4 b/m4/init.m4
deleted file mode 100644
index 724fbc7a..00000000
--- a/m4/init.m4
+++ /dev/null
@@ -1,89 +0,0 @@
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 5
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
-# The purpose of this macro is to provide the user with a means to
-# check macros which are provided without letting her know how the
-# information is coded.
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-
-# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
-# ----------------------------------------------
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
-fi
-
-# Define the identity of the package.
-PACKAGE=$1
-AC_SUBST(PACKAGE)dnl
-VERSION=$2
-AC_SUBST(VERSION)dnl
-ifelse([$3],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-ifdef([m4_pattern_allow],
-      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
-
-# Autoconf 2.50 always computes EXEEXT.  However we need to be
-# compatible with 2.13, for now.  So we always define EXEEXT, but we
-# don't compute it.
-AC_SUBST(EXEEXT)
-# Similar for OBJEXT -- only we only use OBJEXT if the user actually
-# requests that it be used.  This is a bit dumb.
-: ${OBJEXT=o}
-AC_SUBST(OBJEXT)
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal)
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake)
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
diff --git a/po/.cvsignore b/po/.cvsignore
index ed9e941d..5ba9b838 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,4 +1,6 @@
-POTFILES
+*.gmo
 Makefile.in
 Makefile
-*.gmo
+POTFILES
+grep.pot
+stamp-cat-id
diff --git a/src/.cvsignore b/src/.cvsignore
index 282522db..6bb0a52e 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,2 +1,5 @@
 Makefile
 Makefile.in
+egrep
+fgrep
+grep
diff --git a/tests/.cvsignore b/tests/.cvsignore
index 282522db..a357fce2 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,2 +1,7 @@
 Makefile
 Makefile.in
+bre.script
+ere.script
+khadafy.out
+patfile
+spencer1.script