* configure.in: sinclude([vers.m4]) version number file.

* vers.m4: new file to separate version number out of
configure.in, useful for nightly snapshot script to generate
nightly version string.

* Makefile.am (EXTRA_DIST_M4): include vers.m4 in distro.

The function sun_entry2amd's parameters were expanded to include

diff --git a/ChangeLog b/ChangeLog
index 2abfbed64019231a0edef7a3af1b6de2517e1d4b..3fbd7f5a709b42af3851e6e634e3b6e7698ed5ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-14  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * configure.in: sinclude([vers.m4]) version number file.
+
+       * vers.m4: new file to separate version number out of
+       configure.in, useful for nightly snapshot script to generate
+       nightly version string.
+
+       * Makefile.am (EXTRA_DIST_M4): include vers.m4 in distro.
+
 2005-08-14  Daniel P. Ottavio  <dottavio@ic.sunysb.edu>
 
        * amd/info_file.c: add key to sun_entry2amd()'s parameters
@@ -13,7 +23,7 @@
        * amd/info_nisplus.c: add key to sun_entry2amd()'s parameters
 
        * amd/sun_map.c: New functions to support sun translation to amd.
-       The function sun_entry2amd's parameters where expanded to include
+       The function sun_entry2amd's parameters were expanded to include
        the key value.  sun_entry_2amd() now returns NULL on error.
 
        * amd/sun_map.h: Expand sun_entry2amd's parameters to include key
@@ -23,7 +33,7 @@
        of the list of options for each entry.  The previous way was not
        working properly so now we just look for the 'fstype' keyword in
        each option.  If it exists we copy its key value.
-               
+
 2005-08-11  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * amd/sun_map_parse.y: instead of using a custom FOO_alloc()

diff --git a/Makefile.am b/Makefile.am
index 238a14c9836a6ba43359c649a28a24b460eb19ca..5f3c164b51b6843a74b8a8fd58ce0094860e8b92 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,8 @@ SUBDIRS =             \
 # additional files to add to the distribution tar file
 #      m4/aclocal
 EXTRA_DIST_M4 =                                \
+       vers.m4                         \
+       \
        m4/GNUmakefile                  \
        m4/amdgrep                      \
        m4/amindent                     \

diff --git a/configure.in b/configure.in
index 73179f261d96159385b611f27fabc9fc0eb1a3ba..64be017b22a8a0c1ecde9800d348120da1f66e1d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,9 @@ dnl ######################################################################
 dnl INITIALIZATION
 dnl AC_INIT
 dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS
-AC_INIT([am-utils],[6.2a1],[https://bugzilla.am-utils.org/ or am-utils@am-utils.org])
+AC_INIT([am-utils],
+       sinclude([vers.m4]),
+       [https://bugzilla.am-utils.org/ or am-utils@am-utils.org])
 AC_MSG_NOTICE(*** INITIALIZATION ***)
 AC_CONFIG_SRCDIR([amd/amd.c])
 AM_CONFIG_HEADER(config.h)
@@ -53,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.110 $)
+AC_REVISION($Revision: 1.111 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)