From 3a692b405a21d8086c57ff68178ddcf406ad3af0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 19 Mar 1997 07:42:35 +0000 Subject: [PATCH] last-minute fixes --- ChangeLog | 8 +++++ Makefile.in | 25 ++++++++------ aclocal.m4 | 40 +++++++++++++++++++--- configure | 84 +++++++++++++++++++++++++++++++++++++++++++---- m4/Makefile.in | 9 +++-- m4/missing.m4 | 14 +++++--- m4/sanity.m4 | 2 ++ tests/Makefile.in | 9 +++-- 8 files changed, 161 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfb5e3d3..e511bf7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Mar 19 00:35:13 1997 Tom Tromey + + * Released 1.1m. + + * m4/missing.m4: Print message saying what is happening. + + * m4/sanity.m4: sleep before testing. + Tue Mar 18 17:20:03 1997 Tom Tromey * config.guess, config.sub: New from the FSF. diff --git a/Makefile.in b/Makefile.in index 86837ff3..36ae30e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,11 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -69,12 +74,12 @@ EXTRA_DIST = acinstall $(pkgdata_DATA) ETAGS_ARGS = automake.in aclocal.in --lang=none \ --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi -ACLOCAL = $(top_srcdir)/aclocal.m4 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = automake aclocal SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) -MAKEINFO = makeinfo +MAKEINFO = @MAKEINFO@ TEXI2DVI = texi2dvi INFO_DEPS = automake.info DVIS = automake.dvi @@ -84,8 +89,8 @@ DATA = $(pkgdata_DATA) DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \ ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \ -configure.in elisp-comp install-sh interlock mdate-sh mkinstalldirs \ -stamp-vti texinfo.tex version.texi ylwrap +configure.in elisp-comp install-sh interlock mdate-sh missing \ +mkinstalldirs stamp-vti texinfo.tex version.texi ylwrap DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -95,20 +100,20 @@ default: all .SUFFIXES: .SUFFIXES: .texi .texinfo .info .dvi .ps -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnits Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status $(srcdir)/aclocal.m4: configure.in - cd $(srcdir) && aclocal + cd $(srcdir) && $(ACLOCAL) config.status: configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && autoconf +$(srcdir)/configure: configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) automake: $(top_builddir)/config.status automake.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status aclocal: $(top_builddir)/config.status aclocal.in @@ -360,7 +365,7 @@ distdir: $(DISTFILES) -chmod 755 $(distdir) here=`pwd`; distdir=`cd $(distdir) && pwd` \ && cd $(srcdir) \ - && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --gnits + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --gnits @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ diff --git a/aclocal.m4 b/aclocal.m4 index 00e786cb..adec624f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.1g +dnl aclocal.m4 generated automatically by aclocal 1.1m # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -19,6 +19,13 @@ AC_SUBST(VERSION) AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AM_SANITY_CHECK AC_ARG_PROGRAM +dnl FIXME This is truly gross. +missing_dir=`cd $ac_aux_dir && pwd` +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_PROG_MAKE_SET]) @@ -37,9 +44,21 @@ AC_SUBST(INSTALL_SCRIPT)dnl AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) echo timestamp > conftestfile -# Do this in a subshell so we don't clobber the current shell's -# arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? -if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile) +# Just in case +sleep 1 +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "$@" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftestfile` + fi + test "[$]2" = conftestfile + ) then # Ok. : @@ -50,3 +69,16 @@ fi rm -f conftest* AC_MSG_RESULT(yes)]) +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +dnl The program must properly implement --version. +AC_DEFUN(AM_MISSING_PROG, +[AC_MSG_CHECKING(for working $2) +if $2 --version > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi +AC_SUBST($1)]) + diff --git a/configure b/configure index b73e9b0c..9d2ee959 100755 --- a/configure +++ b/configure @@ -617,9 +617,21 @@ EOF echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 echo "configure:619: checking whether build environment is sane" >&5 echo timestamp > conftestfile -# Do this in a subshell so we don't clobber the current shell's -# arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? -if (set X `ls -t $srcdir/configure conftestfile`; test "$2" = conftestfile) +# Just in case +sleep 1 +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftestfile` + fi + test "$2" = conftestfile + ) then # Ok. : @@ -648,8 +660,59 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," +missing_dir=`cd $ac_aux_dir && pwd` +echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +echo "configure:666: checking for working aclocal" >&5 +if aclocal --version > /dev/null 2>&1; then + ACLOCAL=aclocal + echo "$ac_t""found" 1>&6 +else + ACLOCAL="$missing_dir/missing aclocal" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +echo "configure:676: checking for working autoconf" >&5 +if autoconf --version > /dev/null 2>&1; then + AUTOCONF=autoconf + echo "$ac_t""found" 1>&6 +else + AUTOCONF="$missing_dir/missing autoconf" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working automake""... $ac_c" 1>&6 +echo "configure:686: checking for working automake" >&5 +if automake --version > /dev/null 2>&1; then + AUTOMAKE=automake + echo "$ac_t""found" 1>&6 +else + AUTOMAKE="$missing_dir/missing automake" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +echo "configure:696: checking for working autoheader" >&5 +if autoheader --version > /dev/null 2>&1; then + AUTOHEADER=autoheader + echo "$ac_t""found" 1>&6 +else + AUTOHEADER="$missing_dir/missing autoheader" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +echo "configure:706: checking for working makeinfo" >&5 +if makeinfo --version > /dev/null 2>&1; then + MAKEINFO=makeinfo + echo "$ac_t""found" 1>&6 +else + MAKEINFO="$missing_dir/missing makeinfo" + echo "$ac_t""missing" 1>&6 +fi + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:653: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -683,7 +746,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:687: checking for $ac_word" >&5 +echo "configure:750: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -714,7 +777,7 @@ done # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:718: checking for $ac_word" >&5 +echo "configure:781: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -769,8 +832,10 @@ EOF # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. +# /bin/sh on HP-UX has a bug that causes it to die if backquotes used +# in a case generate too much data. So we grep out the part we need. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -895,6 +960,11 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g +s%@ACLOCAL@%$ACLOCAL%g +s%@AUTOCONF@%$AUTOCONF%g +s%@AUTOMAKE@%$AUTOMAKE%g +s%@AUTOHEADER@%$AUTOHEADER%g +s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g s%@TAR@%$TAR%g s%@PERL@%$PERL%g diff --git a/m4/Makefile.in b/m4/Makefile.in index 001e26dd..1b4aee3e 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -32,6 +32,11 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -65,8 +70,8 @@ GZIP = --best default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnits m4/Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ diff --git a/m4/missing.m4 b/m4/missing.m4 index 9e822762..b3819c09 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -4,8 +4,12 @@ dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. AC_DEFUN(AM_MISSING_PROG, -[if $2 --version > /dev/null 2>&1; then - $1=$2 - else - $1="$3/missing $2" - fi]) +[AC_MSG_CHECKING(for working $2) +if $2 --version > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi +AC_SUBST($1)]) diff --git a/m4/sanity.m4 b/m4/sanity.m4 index df1c0540..5aea7727 100644 --- a/m4/sanity.m4 +++ b/m4/sanity.m4 @@ -5,6 +5,8 @@ AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) echo timestamp > conftestfile +# Just in case +sleep 1 # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks diff --git a/tests/Makefile.in b/tests/Makefile.in index 76f906f2..19b78a32 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -32,6 +32,11 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -81,8 +86,8 @@ GZIP = --best default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnits tests/Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ -- 2.43.5