add checks for missing autoconf, autoheader, and aclocal.

	You'll have to re-run 'configure' before you can do 'make reconfig'
	again.

diff --git a/Make.inc.in b/Make.inc.in
index 345d70c..b80dc66 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -25,6 +25,9 @@ CFLAGS                = $(INCLUDE) @CFLAGS@
 LIBPREFIX      = @LIBPREFIX@
 
 LIBTOOL                = @LIBTOOL@
+ACLOCAL                = @ACLOCAL@
+AUTOCONF       = @AUTOCONF@
+AUTOHEADER     = @AUTOHEADER@
 
 LCRYPT         = @CRYPTLIB@
 LDBM           = @DBMLIB@

diff --git a/Makefile b/Makefile
index ae64d7e..9e260a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,12 +68,12 @@ distclean: clean
 reconfig: configure src/include/autoconf.h.in
 
 configure: configure.in aclocal.m4
-       autoconf
+       $(AUTOCONF)
 
 # autoheader might not change autoconf.h.in, so touch a stamp file
 src/include/autoconf.h.in: src/include/stamp-h.in acconfig.h
 src/include/stamp-h.in: configure.in acconfig.h
-       autoheader
+       $(AUTOHEADER)
        echo timestamp > src/include/stamp-h.in
 
 src/include/autoconf.h: src/include/stamp-h

diff --git a/configure.in b/configure.in
index f90b13f..971bf60 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -288,6 +288,12 @@ AC_PATH_PROG(SNMPGET, snmpget, /usr/local/bin/snmpget)
 AC_PATH_PROG(SNMPWALK, snmpwalk, /usr/local/bin/snmpwalk)
 AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers)
 
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+
 dnl #
 dnl # check for AIX, to allow us to use some BSD functions
 dnl # must be before macros that call the compiler.