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 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@
 /uip/whatnow
 /uip/whom
 /nmh-*.tar.gz
 /uip/whatnow
 /uip/whom
 /nmh-*.tar.gz

+/aclocal.m4

 *.o
 *.1
 *.5
 *.o
 *.1
 *.5

diff --git a/Makefile.in b/Makefile.in
index 8bb2b40..753cb5e 100644 (file)
--- 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                \
 
 # 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
 
        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
 
 config.status: configure VERSION
        ./config.status --recheck
 

-configure: configure.ac aclocal.m4
+configure: configure.ac

        cd $(srcdir) && autoconf
 
 config.h: stamp-h
        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
        ./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 > $@
 
        cd $(srcdir) && autoheader
        date > $@
 

diff --git a/autogen.sh b/autogen.sh
index 71a2912..fd544c2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,5 +5,6 @@
 # building from a distributed tarball.
 
 set -e
 # building from a distributed tarball.
 
 set -e

+aclocal -I m4

 autoreconf
 date > stamp-h.in
 autoreconf
 date > stamp-h.in

diff --git a/configure.ac b/configure.ac
index 741d69f..4f3d260 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl ---------------------
 dnl define a macro or two
 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
 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 (file)
--- 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 --------------
 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.
 
 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=
 [
 if test "x$2" = "x"; then
   nmh_libs=

diff --git a/m4/netlibs.m4 b/m4/netlibs.m4
new file mode 100644 (file)
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