From: drl7x Date: Sat, 19 Jan 2002 01:28:33 +0000 (+0000) Subject: Hopefully fixed configuration program caused by running an old version of automake. X-Git-Tag: splint-3_0_1_4 X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/b342881cd72828b58b6b81890ae189cc1892830b Hopefully fixed configuration program caused by running an old version of automake. --- diff --git a/Makefile.in b/Makefile.in index 8d880e0..8eb0f7d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/aclocal.m4 b/aclocal.m4 index 7cfe3a8..e69de29 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,150 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 - -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -m4_define([AH_LCLINT_TEMPLATE], -[AH_VERBATIM([$1], - m4_text_wrap([$2 */], [ ], [/* ]) - m4_text_wrap([$3@*/], [ ], [/*@])[ -#undef $1])]) - -m4_define([AC_DEFINE_LCLINT], -[AC_DEFINE_TRACE([$1])dnl -AH_LCLINT_TEMPLATE([$1], [$3], [$4])dnl -cat >>confdefs.h <<\_ACEOF -[@%:@define] $1 [$2] -_ACEOF -]) - -# 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 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([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_REQUIRE([AC_PROG_MAKE_SET])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# 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 - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -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) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN([AM_CONFIG_HEADER], -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - - -dnl AM_PROG_LEX -dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT -AC_DEFUN([AM_PROG_LEX], -[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) -AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") -AC_PROG_LEX -AC_DECL_YYTEXT]) - diff --git a/bin/Makefile.in b/bin/Makefile.in index e91b029..e1d5e04 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/doc/Makefile.in b/doc/Makefile.in index 6a814f6..ac5c19e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/imports/Makefile.in b/imports/Makefile.in index 708d96a..c9dc555 100644 --- a/imports/Makefile.in +++ b/imports/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/lib/Makefile.in b/lib/Makefile.in index 13209da..45326ae 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/test/Makefile b/test/Makefile index 74ddc45..4009f0c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -72,9 +72,7 @@ LCLOBJ = $(lcl_OBJECTS) LEX = flex LN_S = ln -s MV = mv -PACKAGE = splint RM = rm -VERSION = 3.0.1.4 AUTOMAKE_OPTIONS = 1.5 foreign diff --git a/test/Makefile.in b/test/Makefile.in index d602ffc..a668c2d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -72,9 +72,7 @@ LCLOBJ = @LCLOBJ@ LEX = @LEX@ LN_S = @LN_S@ MV = @MV@ -PACKAGE = @PACKAGE@ RM = @RM@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = 1.5 foreign