From d4d59682e37d44cc49899891acb80824bb2f7e5f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 26 Sep 1998 19:10:24 +0000 Subject: [PATCH] Track recent autoconf changes: * m4/Makefile.in: Rebuilt. * m4/Makefile.am (m4data_DATA): Updated for deleted files. * m4/init.m4 (AM_INIT_AUTOMAKE): Use AC_PROG_INSTALL. * m4/mingw.m4: Removed. * m4/cygwin.m4: Removed. * m4/install.m4: Removed. * m4/exeext.m4: Removed. * automake.in (scan_one_configure_file): Don't look for AM_EXEEXT. (check_cygnus): Only mention AC_EXEEXT. (obsolete_macros): Mention AM_PROG_INSTALL, AM_EXEEXT, AM_CYGWIN32, AM_MINGW32. ($seen_prog_install): Changed interpretation; changed all users. (scan_one_configure_file): Don't look for AM_PROG_INSTALL. ($scripts_installed): Removed. (handle_scripts): Use local $scripts_installed. * aclocal.in (obsolete_macros): Added AM_PROG_INSTALL, AM_EXEEXT, AM_CYGWIN32, AM_MINGW32. --- ChangeLog | 22 ++++++++++++++++++++++ aclocal.in | 4 ++++ automake.in | 38 +++++++++++++++----------------------- m4/Makefile.am | 7 +++---- m4/Makefile.in | 7 +++---- m4/cygwin.m4 | 12 ------------ m4/exeext.m4 | 37 ------------------------------------- m4/init.m4 | 2 +- m4/install.m4 | 13 ------------- m4/mingw.m4 | 12 ------------ 10 files changed, 48 insertions(+), 106 deletions(-) delete mode 100644 m4/cygwin.m4 delete mode 100644 m4/exeext.m4 delete mode 100644 m4/install.m4 delete mode 100644 m4/mingw.m4 diff --git a/ChangeLog b/ChangeLog index 822a4b9..1214d3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +Sat Sep 26 19:31:22 1998 Tom Tromey + + Track recent autoconf changes: + * m4/Makefile.in: Rebuilt. + * m4/Makefile.am (m4data_DATA): Updated for deleted files. + * m4/init.m4 (AM_INIT_AUTOMAKE): Use AC_PROG_INSTALL. + * m4/mingw.m4: Removed. + * m4/cygwin.m4: Removed. + * m4/install.m4: Removed. + * m4/exeext.m4: Removed. + * automake.in (scan_one_configure_file): Don't look for + AM_EXEEXT. + (check_cygnus): Only mention AC_EXEEXT. + (obsolete_macros): Mention AM_PROG_INSTALL, AM_EXEEXT, + AM_CYGWIN32, AM_MINGW32. + ($seen_prog_install): Changed interpretation; changed all users. + (scan_one_configure_file): Don't look for AM_PROG_INSTALL. + ($scripts_installed): Removed. + (handle_scripts): Use local $scripts_installed. + * aclocal.in (obsolete_macros): Added AM_PROG_INSTALL, AM_EXEEXT, + AM_CYGWIN32, AM_MINGW32. + Mon Jul 6 14:52:49 1998 Ian Lance Taylor * compile.am (mostlyclean-compile): If OBJEXT, remove *.$(OBJEXT) diff --git a/aclocal.in b/aclocal.in index 9995ab5..a9833de 100644 --- a/aclocal.in +++ b/aclocal.in @@ -81,6 +81,10 @@ $verbosity = 0; # Now part of autoconf proper, under a different name. 'AM_FUNC_FNMATCH', 'AM_SANITY_CHECK_CC', + 'AM_PROG_INSTALL', + 'AM_EXEEXT', + 'AM_CYGWIN32', + 'AM_MINGW32', # These aren't quite obsolete. # 'md_PATH_PROG', diff --git a/automake.in b/automake.in index f65a4aa..714b4dc 100755 --- a/automake.in +++ b/automake.in @@ -160,12 +160,9 @@ $all_linguas = ''; # Line number at which it appears. $all_linguas_line = 0; -# 1 if AC_PROG_INSTALL seen, 2 if AM_PROG_INSTALL seen. +# 1 if AC_PROG_INSTALL seen. $seen_prog_install = 0; -# 1 if any scripts installed, 0 otherwise. -$scripts_installed = 0; - # Whether AC_PATH_XTRA has been seen in configure.in. $seen_path_xtra = 0; @@ -202,7 +199,7 @@ $package_version_line = 0; # TRUE if we've seen AM_PATH_LISPDIR. $seen_lispdir = 0; -# TRUE if we've seen AM_EXEEXT or AC_EXEEXT. +# TRUE if we've seen AC_EXEEXT. $seen_exeext = 0; # TRUE if we've seen AC_OBJEXT. @@ -254,7 +251,7 @@ $cygnus_mode = 0; 'fp_C_PROTOTYPES', "use \`AM_C_PROTOTYPES'", 'fp_PROG_CC_STDC', "use \`AM_PROG_CC_STDC'", - 'fp_PROG_INSTALL', "use \`AM_PROG_INSTALL'", + 'fp_PROG_INSTALL', "use \`AC_PROG_INSTALL'", 'fp_WITH_DMALLOC', "use \`AM_WITH_DMALLOC'", 'fp_WITH_REGEX', "use \`AM_WITH_REGEX'", 'gm_PROG_LIBTOOL', "use \`AM_PROG_LIBTOOL'", @@ -266,6 +263,10 @@ $cygnus_mode = 0; 'AM_FUNC_FNMATCH', "use \`AC_FUNC_FNMATCH'", 'fp_FUNC_FNMATCH', "use \`AC_FUNC_FNMATCH'", 'AM_SANITY_CHECK_CC', "automatically done by \`AC_PROG_CC'", + 'AM_PROG_INSTALL', "use \`AC_PROG_INSTALL'", + 'AM_EXEEEXT', "use \`AC_EXEEXT'", + 'AM_CYGWIN32', "use \`AC_CYGWIN32'", + 'AM_MINGW32', "use \`AC_MINGW32'", # These aren't quite obsolete. # 'md_PATH_PROG', @@ -321,13 +322,8 @@ foreach $am_file (@input_files) } } -if ($seen_prog_install <= $scripts_installed) -{ - &am_conf_error (($scripts_installed ? 'AM_PROG_INSTALL' : 'AC_PROG_INSTALL') - . " must be used in configure.in"); - &keyed_aclocal_warning ('AM_PROG_INSTALL') - if $scripts_installed; -} +&am_conf_error ("AC_PROG_INSTALL must be used in configure.in") + if (! $seen_prog_install); exit $exit_status; @@ -1959,6 +1955,7 @@ sub handle_scripts 'bin', 'sbin', 'libexec', 'pkgdata', 'noinst', 'check'); + local ($scripts_installed) = 0; # Set $scripts_installed if appropriate. Make sure we only find # scripts which are actually installed -- this is why we can't # simply use the return value of am_install_var. @@ -4231,7 +4228,7 @@ sub scan_one_configure_file $am_c_prototypes = 1 if /AM_C_PROTOTYPES/; # Check for exe extension stuff. - if (/AM_EXEEXT/ || /AC_EXEEXT/) + if (/AC_EXEEXT/) { $seen_exeext = 1; $configure_vars{'EXEEXT'} = 1; @@ -4304,7 +4301,7 @@ sub scan_one_configure_file $seen_package = 1; $seen_version = 1; $seen_arg_prog = 1; - $seen_prog_install = 2; + $seen_prog_install = 1; ($package_version = $1) =~ s/$AM_PACKAGE_VERSION_PATTERN/$1/o; $package_version_line = $.; } @@ -4319,7 +4316,7 @@ sub scan_one_configure_file $seen_package = 1; $seen_version = 1; $seen_arg_prog = 1; - $seen_prog_install = 2; + $seen_prog_install = 1; @config_aux_path = ('..'); } @@ -4389,12 +4386,7 @@ sub scan_one_configure_file $seen_version = 1; } - # Weird conditionals here because it is always allowed to - # upgrade to AM_PROG_INSTALL but never to downgrade to - # AC_PROG_INSTALL. - $seen_prog_install = 1 if ! $seen_prog_install && /AC_PROG_INSTALL/; - $seen_prog_install = 2 if /AM_PROG_INSTALL/; - + $seen_prog_install = 1 if /AC_PROG_INSTALL/; $seen_lispdir = 1 if /AM_PATH_LISPDIR/; if (/AM_PROG_LIBTOOL/) @@ -4476,7 +4468,7 @@ sub check_cygnus if (! $seen_exeext) { - &am_conf_error ("\`AM_EXEEXT' or \`AC_EXEEXT' required when --cygnus specified"); + &am_conf_error ("\`AC_EXEEXT' required when --cygnus specified"); } } diff --git a/m4/Makefile.am b/m4/Makefile.am index baa6d5a..b28da94 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -4,9 +4,8 @@ AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 m4datadir = $(datadir)/aclocal -m4data_DATA = ccstdc.m4 cond.m4 cygwin.m4 dmalloc.m4 exeext.m4 init.m4 \ -install.m4 lex.m4 lispdir.m4 maintainer.m4 mingw.m4 protos.m4 \ -ptrdiff.m4 regex.m4 strtod.m4 termios.m4 winsz.m4 mktime.m4 error.m4 \ -obstack.m4 sanity.m4 header.m4 missing.m4 +m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 \ +lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 obstack.m4 \ +protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4 EXTRA_DIST = $(m4data_DATA) diff --git a/m4/Makefile.in b/m4/Makefile.in index 782f0bd..bf9fb36 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -67,10 +67,9 @@ AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 m4datadir = $(datadir)/aclocal -m4data_DATA = ccstdc.m4 cond.m4 cygwin.m4 dmalloc.m4 exeext.m4 init.m4 \ -install.m4 lex.m4 lispdir.m4 maintainer.m4 mingw.m4 protos.m4 \ -ptrdiff.m4 regex.m4 strtod.m4 termios.m4 winsz.m4 mktime.m4 error.m4 \ -obstack.m4 sanity.m4 header.m4 missing.m4 +m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 \ +lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 obstack.m4 \ +protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4 EXTRA_DIST = $(m4data_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/m4/cygwin.m4 b/m4/cygwin.m4 deleted file mode 100644 index d994a03..0000000 --- a/m4/cygwin.m4 +++ /dev/null @@ -1,12 +0,0 @@ -# Check to see if we're running under Cygwin32, without using -# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes". -# Otherwise set it to "no". - -dnl AM_CYGWIN32() -AC_DEFUN(AM_CYGWIN32, -[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, -[AC_TRY_COMPILE(,[return __CYGWIN32__;], -am_cv_cygwin32=yes, am_cv_cygwin32=no) -rm -f conftest*]) -CYGWIN32= -test "$am_cv_cygwin32" = yes && CYGWIN32=yes]) diff --git a/m4/exeext.m4 b/m4/exeext.m4 deleted file mode 100644 index 2bbb7b3..0000000 --- a/m4/exeext.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# Check to see if we're running under Win32, without using -# AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe". -# Otherwise set it to "". - -dnl AM_EXEEXT() -dnl This knows we add .exe if we're building in the Cygwin32 -dnl environment. But if we're not, then it compiles a test program -dnl to see if there is a suffix for executables. -AC_DEFUN(AM_EXEEXT, -[AC_REQUIRE([AM_CYGWIN32]) -AC_REQUIRE([AM_MINGW32]) -AC_MSG_CHECKING([for executable suffix]) -AC_CACHE_VAL(am_cv_exeext, -[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then -am_cv_exeext=.exe -else -cat > am_c_test.c << 'EOF' -int main() { -/* Nothing needed here */ -} -EOF -${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 -am_cv_exeext= -for file in am_c_test.*; do - case $file in - *.c) ;; - *.o) ;; - *) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;; - esac -done -rm -f am_c_test*]) -test x"${am_cv_exeext}" = x && am_cv_exeext=no -fi -EXEEXT="" -test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} -AC_MSG_RESULT(${am_cv_exeext}) -AC_SUBST(EXEEXT)]) diff --git a/m4/init.m4 b/m4/init.m4 index 3ce28d5..c91a2fb 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -8,7 +8,7 @@ dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AM_PROG_INSTALL]) +[AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] diff --git a/m4/install.m4 b/m4/install.m4 deleted file mode 100644 index 78b0492..0000000 --- a/m4/install.m4 +++ /dev/null @@ -1,13 +0,0 @@ -## --------------------------------------------------------- ## -## Use AC_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## -## substitution. ## -## From Franc,ois Pinard ## -## --------------------------------------------------------- ## - -# serial 1 - -AC_DEFUN(AM_PROG_INSTALL, -[AC_REQUIRE([AC_PROG_INSTALL]) -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -AC_SUBST(INSTALL_SCRIPT)dnl -]) diff --git a/m4/mingw.m4 b/m4/mingw.m4 deleted file mode 100644 index ea4118a..0000000 --- a/m4/mingw.m4 +++ /dev/null @@ -1,12 +0,0 @@ -# Check to see if we're running under Mingw, without using -# AC_CANONICAL_*. If so, set output variable MINGW32 to "yes". -# Otherwise set it to "no". - -dnl AM_MINGW32() -AC_DEFUN(AM_MINGW32, -[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32, -[AC_TRY_COMPILE(,[return __MINGW32__;], -am_cv_mingw32=yes, am_cv_mingw32=no) -rm -f conftest*]) -MINGW32= -test "$am_cv_mingw32" = yes && MINGW32=yes]) -- 2.7.4