summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog11
-rw-r--r--src/aclocal.m412
-rw-r--r--src/configure.in7
3 files changed, 24 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bf1ed2174..6ae18571c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jan 22 07:55:04 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * configure.in: Add in WITH_ANAME_DB and WITH_KDB_DB so that top
+ level configure --help lists options.
+
+ * aclocal.m4 (CHECK_DB): Fix m4 quoting to allow for the autoconf
+ rules to insert the required CPP determination rules
+ automatically.
+ (WITH_ANAME_DB): Add missing comma. Fix up spacing so
+ configure --help looks pretty.
+
Mon Jan 15 02:35:02 1996 Mark Eichin <eichin@cygnus.com>
* aclocal.m4 (WITH_DBM_LNAME): add --with-dbm-lname for callers of
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c932a1074..be7fcab7c 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -998,7 +998,7 @@ define(USE_ANAME,[WITH_ANAME_DB])dnl
dnl
define(WITH_ANAME_DB,[
AC_ARG_WITH([aname-db],
-[ --with-aname-db=DBM name conversion database type]
+[ --with-aname-db=DBM name conversion database type],
dbval="$withval",
dbval=
)dnl
@@ -1015,7 +1015,7 @@ dnl
dnl
define(WITH_KDB_DB,[
AC_ARG_WITH([kdb-db],
-[ --with-kdb-db=DBM kerberos database type],
+[ --with-kdb-db=DBM kerberos database type],
dbval="$withval",
dbval=
)dnl
@@ -1031,22 +1031,22 @@ dnl
dnl
define(CHECK_DB,[
if test "$dbval" = "" -o "$dbval" = ndbm; then
- AC_HEADER_CHECK(ndbm.h,dbval=ndbm
+ AC_HEADER_CHECK(ndbm.h,[dbval=ndbm
AC_DEFINE(NDBM)
AC_CHECK_LIB(ndbm,main,,AC_CHECK_LIB(gdbm,main))
AC_CHECK_DBM_PROTO($dbval,dbm_error,,
AC_DEFINE(MISSING_ERROR_PROTO))
AC_CHECK_DBM_PROTO($dbval,dbm_clearerr,,
- AC_DEFINE(MISSING_CLEARERR_PROTO)))
+ AC_DEFINE(MISSING_CLEARERR_PROTO))])
fi
if test "$dbval" = "" -o "$dbval" = dbm; then
- AC_HEADER_CHECK(dbm.h,dbval=dbm
+ AC_HEADER_CHECK(dbm.h,[dbval=dbm
AC_DEFINE(ODBM)
AC_CHECK_LIB(dbm,main)
AC_CHECK_DBM_PROTO($dbval,dbm_error,,
AC_DEFINE(MISSING_ERROR_PROTO))
AC_CHECK_DBM_PROTO($dbval,dbm_clearerr,,
- AC_DEFINE(MISSING_CLEARERR_PROTO)))
+ AC_DEFINE(MISSING_CLEARERR_PROTO))])
fi
if test "$dbval" = "" -o "$dbval" = db; then
dbval=db
diff --git a/src/configure.in b/src/configure.in
index 1f5ff206d..46d403ccd 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -160,6 +160,13 @@ else
kadminv4=kadmin.v4
krb524=krb524
fi
+dnl
+dnl These are here so that the top level configure --help gives useful
+dnl information.
+dnl
+WITH_ANAME_DB
+WITH_KDB_DB
+dnl
CONFIG_DIRS(util include lib kdc admin kadmin $kadminv4 kadmin.old $krb524 slave clients appl tests config-files)
DO_SUBDIRS
dnl dnl AC_OUTPUT(Makefile,[EXTRA_RULES])