Replace `name_reinit' by `name_end' for more sensible restart.

[become] / configure.in

diff --git a/configure.in b/configure.in
index 9bbf801..69b0582 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.2 1997/08/04 10:24:21 mdw Exp $
+dnl $Id: configure.in,v 1.4 1997/08/20 16:10:56 mdw Exp $
 dnl
 dnl Source for auto configuration for `become'
 dnl
@@ -28,14 +28,23 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl----- Revision history ---------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.4  1997/08/20 16:10:56  mdw
+dnl Lowercase `mdw_' prefixes to macros.  Add a `--with-etcdir=PATH'
+dnl option.  Update `stamp-h' as required by the Automake docs (silly
+dnl me).
+dnl
+dnl Revision 1.3  1997/08/07 09:34:32  mdw
+dnl Added `ElectricFence' support, and support for the `deep' package
+dnl structure.
+dnl
 dnl Revision 1.2  1997/08/04 10:24:21  mdw
 dnl Sources placed under CVS control.
 dnl
-# Revision 1.1  1997/07/21  13:47:51  mdw
-# Initial revision
-#
+dnl Revision 1.1  1997/07/21  13:47:51  mdw
+dnl Initial revision
+dnl
 
-AC_INIT(icrypt.c)
+AC_INIT(src/icrypt.c)
 AC_CONFIG_HEADER(config.h)
 PACKAGE=become VERSION=1.2-pre
 AC_SUBST(PACKAGE)
@@ -49,6 +58,7 @@ AC_PROG_INSTALL
 AC_PROG_LEX
 AC_CHECK_PROG(AR, ar, ar)
 AC_PROG_RANLIB
+AC_PROG_MAKE_SET
 AC_PROG_YACC
 AC_ARG_PROGRAM
 if test "$ac_cv_prog_gcc" = "yes"; then
@@ -57,13 +67,13 @@ fi
 
 dnl --- Libraries ---
 
-MDW_CHECK_MANYLIBS(socket, socket,,
+mdw_CHECK_MANYLIBS(socket, socket,,
   AC_MSG_ERROR([Socket library not found]))
 
-MDW_CHECK_MANYLIBS(gethostbyname, resolv nsl,,
+mdw_CHECK_MANYLIBS(gethostbyname, resolv nsl,,
   AC_MSG_ERROR([Resolver library not found]))
 
-MDW_CHECK_MANYLIBS(yp_all, nsl, AC_DEFINE(HAVE_YP))
+mdw_CHECK_MANYLIBS(yp_all, nsl, AC_DEFINE(HAVE_YP))
 
 dnl --- Types ---
 
@@ -83,8 +93,23 @@ dnl --- Check for some useful functions ---
 
 AC_CHECK_FUNCS(getrusage vtimes)
 
+dnl --- Set configuration directory ---
+
+AC_ARG_WITH([etcdir],
+[  --with-etcdir=PATH    set directory for configuration and key files
+                         [default is /etc/become]],
+[etcdir="$withval"], [etcdir="/etc/become"])
+AC_SUBST(etcdir)
+AC_DEFINE_UNQUOTED(ETCDIR, "$etcdir")
+
 dnl --- Debugging stuff ---
 
+AC_ARG_WITH(electric-fence,
+[  --with-electric-fence         link programs with Electric Fence],
+  [if test "$withval" = "yes"; then
+    AC_CHECK_LIB(efence, malloc)
+  fi])
+
 AC_ARG_ENABLE(debugging,
 [  --enable-debugging    spews vast swathes of useless information],
   [if test "$enableval" = "no"; then
@@ -99,15 +124,9 @@ AC_ARG_ENABLE(tracing,
   fi],
   AC_DEFINE(TRACING))
 
-dnl --- Define where things get put ---
-
-mdw_save_prefix="$prefix"
-test "$prefix" = "NONE" && prefix="$ac_default_prefix"
-AC_DEFINE_UNQUOTED(ETCDIR, "`eval echo ${sysconfdir}`")
-prefix="$mdw_save_prefix"
-
 dnl --- Done ---
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile src/Makefile manual/Makefile,
+          [test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h])
 
 dnl----- That's all, folks --------------------------------------------------