aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2004-02-06 11:48:51 +0000
committerBen Elliston <bje@gnu.org>2004-02-06 11:48:51 +0000
commitdfe3dd5f140723ecc164931f1f0655efd5fb177f (patch)
treece80ab6e35f4b20e6f240ae53a4fcf50fc84768d
parentbebbc688853e2fd5dc8f9c676ca7030df341faa1 (diff)
* configure.ac: Remove commented out code.pre-automake-overhaul
* configure: Regenerate.
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac8
3 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 293bfca..08d7d4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2004-02-06 Ben Elliston <bje@wasabisystems.com>
+2004-02-07 Ben Elliston <bje@wasabisystems.com>
+
+ * configure.ac: Remove commented out code.
+ * configure: Regenerate.
+
+2004-02-06 Ben Elliston <bje@wasabisystems.com>
* site.tmpl: Tidy.
diff --git a/configure b/configure
index 87b6a2b..0da5b59 100755
--- a/configure
+++ b/configure
@@ -1272,7 +1272,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
am__api_version="1.8"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -4971,4 +4970,3 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
done
fi
-
diff --git a/configure.ac b/configure.ac
index 739b260..6451fd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
+
AC_PREREQ(2.50)
AC_INIT(runtest.exp)
-dnl AC_CONFIG_AUX_DIR(..)
-
-dnl These are required by automake
AM_INIT_AUTOMAKE(dejagnu, 1.4.4)
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
@@ -14,7 +12,6 @@ AC_PROG_INSTALL
AC_EXEEXT
AC_PROG_YACC
-dnl AM_PROG_LEX
dnl we need the path to Docbook so we can build packages.
DJ_AC_PATH_DOCBOOK
@@ -31,5 +28,4 @@ AC_SUBST(CONFIG)
AC_CONFIG_SUBDIRS(example/calc example/hello)
AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile)
-
+ testsuite/libdejagnu/Makefile)