[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. ea753f01343768ef27bd27d5eca987a602e3949e

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  ea753f01343768ef27bd27d5eca987a602e3949e (commit)
       via  2daf28cdb048aa7276f05e19980b0a818e82fcf1 (commit)
      from  e9503b88ca04e265a27d8425f9fdcb2c877500f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=ea753f01343768ef27bd27d5eca987a602e3949e


commit ea753f01343768ef27bd27d5eca987a602e3949e
Author: Ken Hornstein <address@hidden>
Date:   Tue Jan 17 14:27:06 2012 -0500

    Convert from our use of aclocal.m4 to a subdirectory with autoconf macros
    in it.

diff --git a/.gitignore b/.gitignore
index db2e5c0..5d5d4db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@
 /uip/whatnow
 /uip/whom
 /nmh-*.tar.gz
+/aclocal.m4
 *.o
 *.1
 *.5
diff --git a/Makefile.in b/Makefile.in
index 8bb2b40..753cb5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ INSTALL_DATA    = @INSTALL_DATA@
 
 # all files in this directory included in the distribution
 DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION                
\
-       ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4       \
+       ChangeLog install-sh mkinstalldirs Makefile.in  \
        config.h.in configure.ac configure stamp-h.in   \
        config.sub config.guess
 
@@ -145,7 +145,7 @@ Makefile: Makefile.in config.status
 config.status: configure VERSION
        ./config.status --recheck
 
-configure: configure.ac aclocal.m4
+configure: configure.ac
        cd $(srcdir) && autoconf
 
 config.h: stamp-h
@@ -153,7 +153,7 @@ stamp-h: config.h.in config.status
        ./config.status config.h stamp
 
 config.h.in: stamp-h.in
-stamp-h.in: configure.ac aclocal.m4
+stamp-h.in: configure.ac
        cd $(srcdir) && autoheader
        date > $@
 
diff --git a/autogen.sh b/autogen.sh
index 71a2912..fd544c2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,5 +5,6 @@
 # building from a distributed tarball.
 
 set -e
+aclocal -I m4
 autoreconf
 date > stamp-h.in
diff --git a/configure.ac b/configure.ac
index 741d69f..4f3d260 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl ---------------------
 dnl define a macro or two
 dnl ---------------------
 
-AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+AC_DEFUN([NMH_PROG_GNU_LIBTOOL], [
 if test -n "$LIBTOOL" ; then
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
diff --git a/aclocal.m4 b/m4/ndbm.m4
similarity index 83%
rename from aclocal.m4
rename to m4/ndbm.m4
index e76b93f..afe62ca 100644
--- a/aclocal.m4
+++ b/m4/ndbm.m4
@@ -1,15 +1,3 @@
-
-#
-# Updated for more modern systems.  Check to see if we need to link against
-# optional libraries for networking functions.
-#
-
-AC_DEFUN([NMH_CHECK_NETLIBS],
-[AC_SEARCH_LIBS([gethostbyname], [nsl], ,
-               [AC_MSG_ERROR([gethostbyname not found])])
- AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])])
-])dnl
-
 dnl --------------
 dnl CHECK FOR NDBM
 dnl --------------
@@ -41,7 +29,7 @@ dnl done AC_PROG_CC or something that implies it before
 dnl using this macro autoconf complains about a recursive
 dnl expansion.
 
-AC_DEFUN(NMH_CHECK_NDBM,
+AC_DEFUN([NMH_CHECK_NDBM],
 [
 if test "x$2" = "x"; then
   nmh_libs=
diff --git a/m4/netlibs.m4 b/m4/netlibs.m4
new file mode 100644
index 0000000..8b55688
--- /dev/null
+++ b/m4/netlibs.m4
@@ -0,0 +1,10 @@
+dnl
+dnl Updated for more modern systems.  Check to see if we need to link against
+dnl optional libraries for networking functions.
+dnl
+
+AC_DEFUN([NMH_CHECK_NETLIBS],
+[AC_SEARCH_LIBS([gethostbyname], [nsl], ,
+               [AC_MSG_ERROR([gethostbyname not found])])
+ AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])])
+])dnl

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=2daf28cdb048aa7276f05e19980b0a818e82fcf1


commit 2daf28cdb048aa7276f05e19980b0a818e82fcf1
Author: Ken Hornstein <address@hidden>
Date:   Tue Jan 17 14:15:32 2012 -0500

    Change the name of AC_CHECK_NETLIBS, since it's not a macro distributed
    by Autoconf.

diff --git a/aclocal.m4 b/aclocal.m4
index a7e5447..e76b93f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4,7 +4,7 @@
 # optional libraries for networking functions.
 #
 
-AC_DEFUN([AC_CHECK_NETLIBS],
+AC_DEFUN([NMH_CHECK_NETLIBS],
 [AC_SEARCH_LIBS([gethostbyname], [nsl], ,
                [AC_MSG_ERROR([gethostbyname not found])])
  AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])])
diff --git a/configure.ac b/configure.ac
index 18b4ab3..741d69f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ dnl Check location of modf
 AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
 
 dnl Checks for network libraries (nsl, socket)
-AC_CHECK_NETLIBS
+NMH_CHECK_NETLIBS
 
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do

-----------------------------------------------------------------------

Summary of changes:
 .gitignore               |    1 +
 Makefile.in              |    6 +++---
 autogen.sh               |    1 +
 configure.ac             |    4 ++--
 aclocal.m4 => m4/ndbm.m4 |   14 +-------------
 m4/netlibs.m4            |   10 ++++++++++
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename aclocal.m4 => m4/ndbm.m4 (84%)
 create mode 100644 m4/netlibs.m4


hooks/post-receive
-- 
The nmh Mail Handling System