diff options
| author | Ben Elliston <bje@gnu.org> | 2004-02-08 12:57:53 +0000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2004-02-08 12:57:53 +0000 |
| commit | 2d2bf0f0a77817d6d78e90952342668f09c668a8 (patch) | |
| tree | bb84a2058c1bfb98288b613efab4b6262b5f87df /configure.ac | |
| parent | 7be5c4df755fb6b7c14432df5e3ff8bee16f2093 (diff) | |
| download | dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.zip dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.tar.gz dejagnu-2d2bf0f0a77817d6d78e90952342668f09c668a8.tar.bz2 | |
* configure.ac: Quote strings throughout in good Autoconf style.
Remove AC_PROG_YACC invocation. Search for docbook2dvi, et al and
expect using AC_PATH_PROG. Remove DJ_AC_PATH_DOCBOOK in favour of
existing macros. Remove stale BOARDS and CONFIG substs. Ensure Tcl
is at version 8.3 or greater.
* configure: Regenerate.
* acinclude.m4: Remove.
* aclocal.m4: Regenerate.
* Makefile.in: Likewise.
* doc/Makefile.am (%.pdf: %.sgml): Use $(DOCBOOK2PDF).
(%.dvi: %.sgml): Use $(DOCBOOK2DVI).
(%.html: %.sgml): Use $(DOCBOOK2HTML).
* doc/Makefile.in: Regenerate.
* example/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* testsuite/libdejagnu/Makefile.in: Likewise.
* TODO: Update.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index c40dbcf..93857cc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(runtest.exp) -AM_INIT_AUTOMAKE(dejagnu, 1.4.4) +AC_INIT([runtest.exp]) +AM_INIT_AUTOMAKE([dejagnu], 1.4.4) AM_MAINTAINER_MODE AC_PROG_MAKE_SET @@ -10,23 +10,32 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL AC_EXEEXT -AC_PROG_YACC -AC_PATH_PROG(EXPECT, expect) +dnl Search for the Docbook utilities. +AC_PATH_PROG([DOCBOOK2DVI], [docbook2dvi], [false]) +AC_PATH_PROG([DOCBOOK2PDF], [docbook2pdf], [false]) +AC_PATH_PROG([DOCBOOK2HTML], [docbook2html], [false]) + +dnl Search for expect. +AC_PATH_PROG([EXPECT], [expect]) if test -z $ac_cv_path_EXPECT ; then AC_MSG_ERROR([unable to locate expect]) fi -dnl we need the path to Docbook so we can build packages. -DJ_AC_PATH_DOCBOOK - -dnl Level of indirection for automake macro (baseboards:boards_DATA) -BOARDS='$(boards)' -AC_SUBST(BOARDS) -CONFIG='$(config)' -AC_SUBST(CONFIG) +dnl Check the Tcl version is >= 8.3. +AC_MSG_CHECKING([Tcl version 8.3 or greater]) +AC_CACHE_VAL(ac_cv_dg_tcl_modern,[ + ac_cv_dg_tcl_modern=`$EXPECT << EOF +if @<:@ expr \\${tcl_version} >= 8.3 @:>@ then { puts yes } else { puts no } +EOF` +]) +if test x${ac_cv_dg_tcl_modern} = xyes ; then + AC_MSG_RESULT(${ac_cv_dg_tcl_modern}) +else + AC_MSG_ERROR([Tcl 8.3 or greater is required]) +fi -AC_CONFIG_SUBDIRS(example/calc example/hello) +AC_CONFIG_SUBDIRS([example/calc example/hello]) -AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile - testsuite/libdejagnu/Makefile) +AC_OUTPUT([Makefile doc/Makefile testsuite/Makefile example/Makefile + testsuite/libdejagnu/Makefile]) |