X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/f60a34341fee6aafd5b878dce23b80af7c60064d..9dc8f71525461775496b3f363a5aa7c462ca4858:/configure.in

diff --git a/configure.in b/configure.in
index ff93341..5c62051 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.19 2003/10/12 00:14:44 mdw Exp $
+dnl $Id$
 dnl
 dnl Source for auto configuration for `become'
 dnl
@@ -25,74 +25,6 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with `become'; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-dnl----- Revision history ---------------------------------------------------
-dnl
-dnl $Log: configure.in,v $
-dnl Revision 1.19  2003/10/12 00:14:44  mdw
-dnl Major overhaul.  Now uses DSA signatures rather than the bogus symmetric
-dnl encrypt-and-hope thing.  Integrated with mLib and Catacomb.
-dnl
-dnl Revision 1.18  1999/07/28 09:30:12  mdw
-dnl Use new-fangled mdw_TYPE_SSIZE_T macro.
-dnl
-dnl Revision 1.17  1999/05/04 16:25:19  mdw
-dnl Fixes for new version of automake.
-dnl
-dnl Revision 1.16  1998/06/18  15:15:45  mdw
-dnl Set version number properly.  D'oh.
-dnl
-dnl Revision 1.15  1998/06/18 15:11:36  mdw
-dnl Change patchlevel.  Check for @sigprocmask@, for improved @noise__shell@
-dnl function.
-dnl
-dnl Revision 1.14  1998/06/08 11:22:16  mdw
-dnl Step version number and date.
-dnl
-dnl Revision 1.13  1998/04/23 13:34:10  mdw
-dnl Release version.
-dnl
-dnl Revision 1.12  1998/04/23 13:09:24  mdw
-dnl Add new option to disable networking.
-dnl
-dnl Revision 1.11  1998/02/20 17:55:56  mdw
-dnl Fix default HTML directory.
-dnl
-dnl Revision 1.10  1998/01/12 16:45:21  mdw
-dnl Fix copyright date.
-dnl
-dnl Revision 1.9  1997/09/18  11:24:27  mdw
-dnl Add `conf' directory.  Add an `htmldir' installation directory too.
-dnl
-dnl Revision 1.8  1997/09/17  10:36:30  mdw
-dnl Remove `set.c'.  No longer necessary.
-dnl
-dnl Revision 1.7  1997/09/09 18:18:41  mdw
-dnl Check for setgroups(2), to see whether subsidiary group lists need to be
-dnl fiddled with.
-dnl
-dnl Revision 1.6  1997/09/08  13:41:14  mdw
-dnl Check for `setreuid' for changing permissions.
-dnl
-dnl Revision 1.5  1997/09/05  11:45:18  mdw
-dnl Add support for different login styles, and environment variable
-dnl manipulation in a safe and useful way.
-dnl
-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
-dnl Revision 1.1  1997/07/21  13:47:51  mdw
-dnl Initial revision
-dnl
-
 AC_INIT(src/become.c)
 AM_INIT_AUTOMAKE(become, 1.4.0)
 AM_CONFIG_HEADER(config.h)
@@ -118,14 +50,15 @@ AC_ARG_ENABLE([style],
      ;;
 esac],
 [style="l_preserve"])
-AC_DEFINE_UNQUOTED(DEFAULT_LOGIN_STYLE, $style)
+AC_DEFINE_UNQUOTED([DEFAULT_LOGIN_STYLE], [$style],
+                   [Default login style: l_preserve, l_setuser or l_login.])
 
 dnl --- Choose networking options ---
 
 AC_ARG_ENABLE([network],
 [  --disable-network      disable the client-server bits of the program],
   [if test "$enableval" = "no"; then
-    AC_DEFINE(NONETWORK)
+    AC_DEFINE([NONETWORK], [1], [Define to disable network support.])
   fi])
 
 dnl --- Set configuration directory ---
@@ -135,7 +68,12 @@ AC_ARG_WITH([etcdir],
 			  [default is /etc/become]],
 [etcdir="$withval"], [etcdir="/etc/become"])
 AC_SUBST(etcdir)
-AC_DEFINE_UNQUOTED(ETCDIR, "$etcdir")
+
+AC_ARG_WITH([pidfile],
+[  --with-pidfile=PATH	  set filename for pidfile 
+                          [default is ETCDIR/become/pid]],
+[pidfile="$withval"], [pidfile="${etcdir}/become.pid"])
+AC_SUBST(pidfile)
 
 AC_ARG_WITH([htmldir],
 [  --with-htmldir=PATH	  set directory for HTML documentation
@@ -143,6 +81,13 @@ AC_ARG_WITH([htmldir],
 [htmldir="$withval"], [htmldir='${prefix}/html/become'])
 AC_SUBST(htmldir)
 
+AH_TEMPLATE([ETCDIR], [Where Become should look for its configuration.])
+AH_TEMPLATE([file_PID], [Where Become should write its process-id.])
+mdw_DEFINE_PATHS([
+  mdw_DEFINE_PATH([ETCDIR], [$etcdir])
+  mdw_DEFINE_PATH([file_PID], [$pidfile])
+])
+
 dnl --- Debugging stuff ---
 
 mdw_OPT_EFENCE
@@ -152,19 +97,21 @@ mdw_OPT_TRACE
 dnl --- Libraries ---
 
 mdw_MLIB(2.0.1)
-mdw_CATACOMB(2.0.1)
+mdw_CATACOMB(2.1.0)
 
 mdw_CHECK_MANYLIBS(socket, socket,,
-  [AC_MSG_ERROR([Socket library not found])])
+  [AC_MSG_ERROR([Socket library not found.])])
 
 mdw_CHECK_MANYLIBS(gethostbyname, resolv nsl,,
-  [AC_MSG_ERROR([Resolver library not found])])
+  [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], [1], 
+             [Define if you have (and want to use) the Yellow Peril.])])
 
 dnl --- Other functions ---
 
-AC_CHECK_FUNCS(sigprocmask)
+AC_CHECK_FUNCS([sigprocmask])
 
 dnl --- Types ---
 
@@ -174,7 +121,7 @@ mdw_TYPE_SSIZE_T
 
 dnl --- Set the path separator ---
 
-AC_DEFINE(PATHSEP, '/')
+AC_DEFINE([PATHSEP], ['/'], [Your operating system's path separator.])
 
 dnl --- Check for some useful functions ---