added 3rd arg to init function

diff --git a/ChangeLog b/ChangeLog
index d02fce9987611c715623d7e399af0d3500834b7f..7691a552f6efd2118a6b0cac77e32f24a2358834 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Mar 27 17:28:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * m4/init.m4: Added optional 3rd argument, which avoids
+       AC_DEFINE.
+
        * automake.in (scan_one_configure_file): Explicitly avoid
        INSTALL_SCRIPT to avoid defining it twice.
 

diff --git a/automake.texi b/automake.texi
index 434e9d57371e68509d289b51f9be60fa2ff04ba2..27cd48180a906d79e1d59f165ef9a0ac71f9adf4 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -679,11 +679,19 @@ Use the macro @code{AC_ARG_PROGRAM} if a program or script is installed.
 Use @code{AC_PROG_MAKE_SET} if the package is not flat.
 @cvindex AC_PROG_MAKE_SET
 
+@item
+Use @code{AM_SANITY_CHECK} to make sure the build environment is sane.
+
 @item
 Use @code{AM_PROG_INSTALL} if any scripts (@pxref{Scripts}) are
 installed by the package.  Otherwise, use @code{AC_PROG_INSTALL}.
 @cvindex AC_PROG_INSTALL
 @cvindex AM_PROG_INSTALL
+
+@item
+Use @code{AM_MISSING_PROG} to see whether the programs @code{aclocal},
+@code{autoconf}, @code{automake}, @code{autoheader}, and @code{makeinfo}
+are in the build environment.
 @end itemize
 
 
@@ -958,6 +966,12 @@ define @code{GWINSZ_IN_SYS_IOCTL}.  Otherwise @code{TIOCGWINSZ} can be
 found in @file{<termios.h>}.
 @cvindex AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
 
+@item AM_INIT_AUTOMAKE
+Runs many macros that most @file{configure.in}'s need.  This macro has
+two required arguments, the package and the version number.  By default
+this macro @code{AC_DEFINE}'s @samp{PACKAGE} and @samp{VERSION}.  This
+can be avoided by passing in a non-empty third argument.
+
 @item AM_PATH_LISPDIR
 Searches for the program @code{emacs}, and, if found, sets the output
 variable @code{lispdir} to the full path to Emacs' site-lisp directory.
@@ -981,12 +995,12 @@ code in ANSI C, you can make an un-ANSIfied copy of it by using the
 Like @code{AC_PROG_INSTALL}, but also defines @code{INSTALL_SCRIPT}.
 @cvindex AM_PROG_INSTALL
 
-@item AM_SANITY_CHECK_CC
+@item AM_SANITY_CHECK
 This checks to make sure that a file created in the build directory is
 newer than a file in the source directory.  This can fail on systems
 where the clock is set incorrectly.  This macro is automatically run
 from @code{AM_INIT_AUTOMAKE}.
-@cvindex AM_SANITY_CHECK_CC
+@cvindex AM_SANITY_CHECK
 
 @item AM_SYS_POSIX_TERMIOS
 Check to see if POSIX termios headers and functions are available on the

diff --git a/m4/init.m4 b/m4/init.m4
index 578b300fb3236f70a7a248518ee1563e14e6ca09..68e78efcf0d06f55b164cfe11cc31391525fafc7 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -5,16 +5,17 @@
 # serial 1
 
 dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version)
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AM_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 VERSION=[$2]
 AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
 AM_SANITY_CHECK
 AC_ARG_PROGRAM
 dnl FIXME This is truly gross.

diff --git a/stamp-vti b/stamp-vti
index 3678e878b99d5b30329eb09632f99af11ca1149e..0e52250dd17e3e929d6af412ef3717ecca6500dc 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 25 March 1997
+@set UPDATED 27 March 1997
 @set EDITION 1.1n
 @set VERSION 1.1n

diff --git a/version.texi b/version.texi
index 3678e878b99d5b30329eb09632f99af11ca1149e..0e52250dd17e3e929d6af412ef3717ecca6500dc 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 25 March 1997
+@set UPDATED 27 March 1997
 @set EDITION 1.1n
 @set VERSION 1.1n