From: Alexandre Duret-Lutz Date: Wed, 25 Sep 2002 18:46:41 +0000 (+0000) Subject: * configure.in: Check for 'tex'. X-Git-Tag: Release-1-7~3 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5c4d5ecc21e6d78b441ed1f3456310af1d69e7b2;p=automake.git * configure.in: Check for 'tex'. * tests/defs.in: Handle required=tex using configure's result. Reported by Patrick Welche. --- diff --git a/ChangeLog b/ChangeLog index 06c50640..f8f99055 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-09-25 Alexandre Duret-Lutz + * configure.in: Check for 'tex'. + * tests/defs.in: Handle required=tex using configure's result. + Reported by Patrick Welche. + * Makefile.am (mdate-sh): Remove. * mdate-sh: Delete. Suggested by Akim Demaille. diff --git a/Makefile.in b/Makefile.in index 5a991638..e5293297 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/configure b/configure index 6d6f66a3..0612c461 100755 --- a/configure +++ b/configure @@ -270,7 +270,7 @@ PACKAGE_STRING='GNU Automake 1.6g' PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_unique_file="automake.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL LN EGREP FGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1632,6 +1632,43 @@ echo "$as_me: error: perl 5.005 or better is required" >&2;} { (exit 1); exit 1; }; } } +# The test suite will skip some tests if tex is absent. +# Extract the first word of "tex", so it can be a program name with args. +set dummy tex; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_TEX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$TEX"; then + ac_cv_prog_TEX="$TEX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_TEX="tex" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +TEX=$ac_cv_prog_TEX +if test -n "$TEX"; then + echo "$as_me:$LINENO: result: $TEX" >&5 +echo "${ECHO_T}$TEX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + # Test for Autoconf. We run Autoconf in a subdirectory to ease # deletion of any files created (such as those added to # autom4te.cache). @@ -2346,6 +2383,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t s,@APIVERSION@,$APIVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t s,@PERL@,$PERL,;t t +s,@TEX@,$TEX,;t t s,@LN@,$LN,;t t s,@EGREP@,$EGREP,;t t s,@FGREP@,$FGREP,;t t diff --git a/configure.in b/configure.in index fb319dbf..ac7b69de 100644 --- a/configure.in +++ b/configure.in @@ -53,6 +53,9 @@ $PERL -e 'require 5.005;' || { AC_MSG_ERROR([perl 5.005 or better is required]) } +# The test suite will skip some tests if tex is absent. +AC_CHECK_PROG([TEX], [tex], [tex]) + # Test for Autoconf. We run Autoconf in a subdirectory to ease # deletion of any files created (such as those added to # autom4te.cache). diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index be5d9b95..57ef6b6a 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/lib/Makefile.in b/lib/Makefile.in index dd0f569d..557e8400 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 90562415..0e4ee252 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/m4/Makefile.in b/m4/Makefile.in index d57c6793..caf32d12 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 110ae8ae..0f9964b5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -68,6 +68,7 @@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ bindir = @bindir@ diff --git a/tests/defs.in b/tests/defs.in index 747e1477..6a8d5fca 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -102,6 +102,11 @@ then rm -f $priv_check_temp test $overwrite_status = 0 && exit 77 ;; + tex) + # No all versions of Tex support `--version', so we use + # a configure check. + test -n "@TEX@" || exit 77 + ;; # Generic case: the tool must support --version. *) echo "$me: running $tool --version"