General cleanup of autoconf-2.50 upgrade:

* configure.ac: Mark as needing autoconf-mode in
emacs.  Pass arguments to AC_INIT.
* cdemo/configure.ac: Ditto.
* demo/configure.ac: Ditto.
* depdemo/configure.ac: Ditto.
* libtldl/configure.ac: Ditto.
* mdemo/configure.ac: Ditto.
* pdemo/configure.ac: Ditto.
* tagdemo/configure.ac: Ditto.
* ltdl.m4: Mark as needing autoconf-mode in
emacs.
* libtool.m4: Mark as needing autoconf-mode in
emacs.  Don't add () to AS_MESSAGE_LOG_FD.
* libltdl/configure.ac: Use config-h.in as
template for config.h.
* tagdemo/configure.ac: Drop the AC_DIAGNOSTIC. Move
AC_LANG([C++]) after the OBJEXT/EXEEXT check.

diff --git a/ChangeLog b/ChangeLog
index 8825d10a64887c82d3ec1b58db82040d12982e59..4dbfb88c217f827eb6b7060d2dcb8d1c5250e357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2001-06-29  Tim Van Holder  <tim.van.holder@pandora.be>
+
+       General cleanup of autoconf-2.50 upgrade:
+       * configure.ac: Mark as needing autoconf-mode in
+       emacs.  Pass arguments to AC_INIT.
+       * cdemo/configure.ac: Ditto.
+       * demo/configure.ac: Ditto.
+       * depdemo/configure.ac: Ditto.
+       * libtldl/configure.ac: Ditto.
+       * mdemo/configure.ac: Ditto.
+       * pdemo/configure.ac: Ditto.
+       * tagdemo/configure.ac: Ditto.
+       * ltdl.m4: Mark as needing autoconf-mode in
+       emacs.
+       * libtool.m4: Mark as needing autoconf-mode in
+       emacs.  Don't add () to AS_MESSAGE_LOG_FD.
+       * libltdl/configure.ac: Use config-h.in as
+       template for config.h.
+       * tagdemo/configure.ac: Drop the AC_DIAGNOSTIC. Move
+       AC_LANG([C++]) after the OBJEXT/EXEEXT check.
+
 2001-06-29  Gary V. Vaughan  <gary@gnu.org>
 
        From Tim Van Holder <tim.van.holder@pandora.be>

diff --git a/README b/README
index c279e31038c02ebc868021fe0c39e3fc66fc1de7..6bba8491551d375dd766ab2b94062ad9ac84939e 100644 (file)
--- a/README
+++ b/README
@@ -61,6 +61,10 @@ NOTE: Libtool has only been tested with the Siemens C-compiler and
 an old version of gcc provided by Marco Walther you can find on
 ftp://ftp.mch.sni.de/sni/mr/pd/gnu/gcc/gcc.2.7.2.3 on Reliant Unix.  
 
+NOTE: libtool.m4, ltdl.m4 and the configure.ac files are marked to use
+autoconf-mode, which is distributed with GNU Emacs 21, and all recent
+releases of XEmacs.
+
 Libtool's home page is:
 
   http://www.gnu.org/software/libtool/libtool.html

diff --git a/cdemo/configure.ac b/cdemo/configure.ac
index 7b5b4e3fabef1f2558833ab83ee1279aa8506744..4bb14cb559372c2bc744e9e1ac6cf7a2c5134d37 100644 (file)
--- a/cdemo/configure.ac
+++ b/cdemo/configure.ac
@@ -1,7 +1,7 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*-Autoconf-*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT(cdemo, 0.1)
 AC_CONFIG_SRCDIR([main.c])
 AM_INIT_AUTOMAKE(cdemo,0.1)
 

diff --git a/configure.ac b/configure.ac
index f8de252f63108da3b544e52391a89f7aef911cc5..fb5e089a35a30b548c359c61f4a475f49b91d483 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-## Process this file with autoconf to create configure.
+## Process this file with autoconf to create configure. -*- autoconf -*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT([libtool], [1.4a], [bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([ltmain.in])
 
 AM_INIT_AUTOMAKE(libtool, 1.4a)

diff --git a/demo/configure.ac b/demo/configure.ac
index fc1e0cab36733498256c155ad8558441ada9579d..7d54ec7a71555408a9c5d5590f1122d53b1ce7ef 100644 (file)
--- a/demo/configure.ac
+++ b/demo/configure.ac
@@ -1,7 +1,7 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*-Autoconf-*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT(hell, 1.0)
 AC_CONFIG_SRCDIR([hello.c])
 AM_INIT_AUTOMAKE(hell,1.0)
 

diff --git a/depdemo/configure.ac b/depdemo/configure.ac
index f5d8d6dda16eb33f98214a3f87701b986b76cf27..865d2f568e73ca45229cb203f28f77346a6895b0 100644 (file)
--- a/depdemo/configure.ac
+++ b/depdemo/configure.ac
@@ -1,7 +1,7 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*-Autoconf-*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT(depdemo, 0.1)
 AC_CONFIG_SRCDIR([main.c])
 AM_INIT_AUTOMAKE(depdemo,0.1)
 

diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 05f12230172717e26199ec661792b56b5f8ba9a8..3af0a75c2e51327634c794d09ef8a8a13cd23198 100644 (file)
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -1,7 +1,8 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*- autoconf -*-
 
 AC_PREREQ(2.50)
-AC_INIT(ltdl.c)
+AC_INIT(libltdl, 1.1)
+AC_CONFIG_SRCDIR(ltdl.c)
 
 dnl We shouldn't be using these internal macros of autoconf,
 dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
@@ -23,7 +24,7 @@ if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
 fi
 
 AM_INIT_AUTOMAKE(libltdl,1.1,-)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h:config-h.in)
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
@@ -38,8 +39,3 @@ AC_LIB_LTDL
 
 dnl Output the makefile
 AC_OUTPUT(Makefile)
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

diff --git a/libtool.m4 b/libtool.m4
index 66d0aab04ca9f4abb72498c72410c0ed84b4049e..ecdb97353353919bae887d3096be8db9ccb5487f 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1,4 +1,4 @@
-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 ## Copyright 1996, 1997, 1998, 1999, 2000, 2001
 ## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -24,7 +24,6 @@
 
 # serial 47 AC_PROG_LIBTOOL
 
-# The next line was added by Bruno Haible 2001-06-28.
 builtin([undefine],[symbols])
 
 # AC_PROG_LIBTOOL
@@ -486,7 +485,7 @@ AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION,
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD()
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
      else
        $2=yes
      fi
@@ -518,7 +517,7 @@ AC_DEFUN(AC_LIBTOOL_LINKER_OPTION,
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD()
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
      else
        $2=yes
      fi
@@ -802,7 +801,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
      # So say no if there are warnings
      if test -s out/conftest.err; then
        # Append any errors to the config.log.
-       cat out/conftest.err 1>&AS_MESSAGE_LOG_FD()
+       cat out/conftest.err 1>&AS_MESSAGE_LOG_FD
      else
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
@@ -3627,16 +3626,16 @@ EOF
          LIBS="$lt_save_LIBS"
          CFLAGS="$lt_save_CFLAGS"
        else
-         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD()
+         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
        fi
       else
-       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD()
+       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
       fi
     else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD()
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
     fi
   else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD()
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
   rm -f conftest* conftst*

diff --git a/ltdl.m4 b/ltdl.m4
index 27bdb3d6aa00bee8220e40c342d938c577a41fb5..ad39d85de4e9bc2e3342ec0fd2bde7d1d7a547eb 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -1,4 +1,4 @@
-## ltdl.m4 - Configure ltdl for the target system. -*-Shell-script-*-
+## ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
 ## Copyright (C) 1999-2000 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify

diff --git a/mdemo/configure.ac b/mdemo/configure.ac
index 3cad93418308fd65048df84387fd9bdce66a4f80..27fefcccfbd35a16c5c1f5a5e77b836d02d586b7 100644 (file)
--- a/mdemo/configure.ac
+++ b/mdemo/configure.ac
@@ -1,7 +1,7 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*-Autoconf-*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT(mdemo, 0.1)
 AC_CONFIG_SRCDIR([main.c])
 AM_INIT_AUTOMAKE(mdemo,0.1)
 

diff --git a/pdemo/configure.ac b/pdemo/configure.ac
index 38e3394686fc89b128986c2730746dafa11264e9..4725f384e739180a2e1db8ccc7c8009d2dd27ac2 100644 (file)
--- a/pdemo/configure.ac
+++ b/pdemo/configure.ac
@@ -1,7 +1,7 @@
-dnl Process this file with autoconf to create configure.
+dnl Process this file with autoconf to create configure. -*-Autoconf-*-
 
 AC_PREREQ(2.50)
-AC_INIT
+AC_INIT(hell, 1.0)
 AC_CONFIG_SRCDIR([longer_file_name_hello.c])
 AM_INIT_AUTOMAKE(hell,1.0)
 

diff --git a/tagdemo/configure.ac b/tagdemo/configure.ac
index 623fa297fa41a660b3cfed5c45a24f4e73feff04..40ce74c7a0e83b7480854790b92074de73228630 100644 (file)
--- a/tagdemo/configure.ac
+++ b/tagdemo/configure.ac
@@ -1,4 +1,4 @@
-dnl
+dnl -*-Autoconf-*-
 dnl $Id$
 
 dnl
@@ -7,8 +7,9 @@ dnl application.
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-
-AC_INIT
+AC_PREREQ(2.50)
+dnl Can't use $PACKAGE/$VERSION here
+AC_INIT(foo, 0.1)
 AC_CONFIG_SRCDIR([foo.cpp])dnl
 
 dnl Check what platform we are running on.
@@ -18,8 +19,7 @@ dnl Cause GNU Automake to initialize the state of things and run
 dnl some sanity checks
 PACKAGE=foo
 VERSION=0.1
-
-AM_INIT_AUTOMAKE("$PACKAGE", "$VERSION", DUMMY)dnl
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl Check the C compiler and preprocessor.
 AC_PROG_CC
@@ -30,9 +30,6 @@ dnl Check the C++ compiler and preprocessor.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 
-dnl Set the test language to C++.
-AC_LANG([C++])
-
 # As of the writing of this demo, GNU Autoconf's AC_OBJEXT and
 # AC_EXEEXT macros only works for C compilers!
 # Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting
@@ -40,9 +37,6 @@ AC_LANG([C++])
 # called so that the proper values are cached beforehand.  We also do
 # it before any linker flags (LDFLAGS) are set so that C++ specific
 # ones don't break the tests.
-AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE',
-and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
-
 AC_LANG_PUSH([C])
 AC_OBJEXT
 AC_EXEEXT
@@ -50,6 +44,9 @@ AC_LANG_POP
 
 dnl Setup Libtool
 
+dnl Set the test language to C++.
+AC_LANG([C++])
+
 dnl Check for libtool and turn on Automake processing for Libtool
 AM_PROG_LIBTOOL
 
@@ -58,10 +55,6 @@ AC_CHECK_HEADERS(math.h)
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
-AC_CONFIG_FILES([
-  Makefile
- ])
-AC_CONFIG_COMMANDS([default],[[
-  echo "Done configuring package $PACKAGE"
- ]],[[]])
+AC_CONFIG_FILES(Makefile)
+AC_CONFIG_COMMANDS([default], [[echo "Done configuring package $PACKAGE"]])
 AC_OUTPUT