From 27fb3b270fc6d2b974e762fab36e7eacf32d5112 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Thu, 5 May 2005 23:25:03 +0000
Subject: [PATCH] Fixing for new autotools.

---
 .links          |  4 ---
 acconfig.h      | 91 ---------------------------------------------------------
 configure.in    | 21 ++++++++-----
 setup           |  4 +--
 src/Makefile.am |  4 +--
 src/become.h    | 13 +++++++++
 src/parser.y    |  8 ++---
 7 files changed, 34 insertions(+), 111 deletions(-)
 delete mode 100644 acconfig.h

diff --git a/.links b/.links
index b16ee17..e1fb37e 100644
--- a/.links
+++ b/.links
@@ -1,7 +1,3 @@
 COPYING
-install-sh
 manual/gpl.texi
-manual/texinfo.tex
 manual/texinice.tex
-missing
-mkinstalldirs
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 607f3f0..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*-c-*-
- *
- * $Id: acconfig.h,v 1.12 2004/04/08 01:36:20 mdw Exp $
- *
- * Default settings for `become' config.h
- *
- * (c) 1998 Mark Wooding
- */
-
-/*----- Licensing notice --------------------------------------------------*
- *
- * This file is part of `become'
- *
- * `Become' is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * `Become' is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with `become'; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/*----- Variables set up by the configuration script ----------------------*/
-@TOP@
-
-/* My package name.  */
-#define PACKAGE "become"
-
-/* My version number.  */
-#define VERSION "1.2-pre"
-
-/* The `etcdir' contains configuration and state information.  */
-#define ETCDIR "/etc/become"
-
-/* The `pidfile' is where Become puts its process id if it runs as a
- * daemon. */
-#define file_PID "/etc/become/become.pid"
-
-/* Default login style can be `l_preserve', `l_setuser' or `l_login'.  */
-#define DEFAULT_LOGIN_STYLE l_preserve
-
-/* This is replaced by `/' by `configure' -- leave alone for DOSness.  */
-#define PATHSEP '\\'
-
-/* Define to turn off networking support.  */
-#undef NONETWORK
-
-/* Debugging options. */
-#undef NTRACE
-
-#ifndef TEST_RIG
-#undef NDEBUG
-#endif
-
-/* Define if we have YP support.  */
-#undef HAVE_YP
-
-/* Define to `int' if nothing defines.  */
-#undef ssize_t
-
-@BOTTOM@
-
-/*----- Some light processing on the configuration variables --------------*/
-
-/* --- Important filenames based on the @ETCDIR@ --- */
-
-#define file_KEY ETCDIR "/become.key"
-#define file_PUBKEY ETCDIR "/become.pubkey"
-#define file_RULES ETCDIR "/become.conf"
-#define file_SERVER ETCDIR "/become.server"
-
-/* --- Debugging macros --- */
-
-#ifdef NDEBUG
-#  define D(x) /* empty */
-#else
-#  define D(x) x
-#endif
-
-/*----- That's all, folks -------------------------------------------------*/
-
-#endif
diff --git a/configure.in b/configure.in
index d673178..5c62051 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.22 2004/04/17 10:46:08 mdw Exp $
+dnl $Id$
 dnl
 dnl Source for auto configuration for `become'
 dnl
@@ -50,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 ---
@@ -80,6 +81,8 @@ 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])
@@ -97,16 +100,18 @@ mdw_MLIB(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 ---
 
@@ -116,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 ---
 
diff --git a/setup b/setup
index 5173638..e093ee9 100755
--- a/setup
+++ b/setup
@@ -5,5 +5,5 @@ mklinks
 mkaclocal
 autoheader
 autoconf
-automake
-mkdir build
+automake -a
+mkdir -p build
diff --git a/src/Makefile.am b/src/Makefile.am
index f502d8e..66e8060 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with `automake' to generate `Makefile.in'
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.17 2004/04/08 01:36:20 mdw Exp $
+## $Id$
 ##
 ## Makefile for `become'
 ##
@@ -52,7 +52,7 @@ BUILT_SOURCES = \
 
 ## --- Yaccing and lexing ---
 
-YFLAGS = -d -v
+AM_YFLAGS = -d -v
 
 dist-hook:
 	for i in $(BUILT_SOURCES); do \
diff --git a/src/become.h b/src/become.h
index 4864a12..b08f72c 100644
--- a/src/become.h
+++ b/src/become.h
@@ -44,6 +44,19 @@
 #  include "config.h"
 #endif
 
+/*----- Other configuration -----------------------------------------------*/
+
+#define file_KEY ETCDIR "/become.key"
+#define file_PUBKEY ETCDIR "/become.pubkey"
+#define file_RULES ETCDIR "/become.conf"
+#define file_SERVER ETCDIR "/become.server"
+
+#ifdef NDEBUG
+#  define D(x) /* empty */
+#else
+#  define D(x) x
+#endif
+
 /*----- Tracing levels ----------------------------------------------------*/
 
 #define TRACE_SILENT	0u
diff --git a/src/parser.y b/src/parser.y
index 860ed7e..f7ed0e3 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: parser.y,v 1.9 2004/04/08 01:36:20 mdw Exp $
+ * $Id$
  *
  * Parser for `become.conf' files
  *
@@ -62,6 +62,9 @@
 #include "rule.h"
 #include "userdb.h"
 
+#define YYDEBUG 1
+#define YYERROR_VERBOSE
+
 %}
 /*----- Stack type --------------------------------------------------------*/
 
@@ -102,9 +105,6 @@
 /*----- Error reporting ---------------------------------------------------*/
 %{
 
-#define YYDEBUG 1
-#define YYERROR_VERBOSE
-
 /* --- @yyprint@ --- *
  *
  * Arguments:	@FILE *fp@ = pointer to stream to write on
-- 
2.11.0