Simplified to simply require the use of WITH_ANAME or USE_KDB5_LIBRARY

to specify the need for dbm inclusion/testing/compilation flags.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7350 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 6 insertions, 76 deletions

diff --git a/src/lib/configure.in b/src/lib/configure.in
index 0a1bae639..3a5bfd190 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -2,16 +2,7 @@ AC_INIT(configure.in)
 CONFIG_RULES
 if test $krb5_cv_build_krb4_libs = yes ; then
 	AC_MSG_RESULT(building Kerberos 4 libraries)
-	AC_ARG_WITH([kdb4],
-	[  --with-kdb4		use Kerberos version 4 database library.
-	  --without-kdb4	Avoid using Kerberos version 4 database library.],
-	,
-	withval=no)dnl
-	if test "$withval" = no; then
-		kdb4=
-	else
-		kdb4=kdb4
-	fi
+	WITH_KDB4(kdb4=kdb4,kdb4=)
 	krb4=krb4
 else
 	AC_MSG_RESULT(skipping Kerberos 4 libraries)
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index e450ad6e4..3e96d8a7c 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,5 +1,4 @@
-DBFLAGS=@DBFLAGS@
-CFLAGS = $(CCOPTS) $(DEFS) $(DBFLAGS)
+CFLAGS = $(CCOPTS) $(DEFS)
 
 all:: $(OBJS)
 
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 4b45a6a1e..504755a56 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -5,54 +5,7 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h)
-AC_ARG_WITH([dbm],
-[  --with-dbm		use native dbm for kdc database
-  --without-dbm		use included version of Berkeley db (default)],
-,
-withval=no)dnl
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Using native dbm)
-	DBFLAGS=
-else
-	AC_MSG_RESULT(Using Berkeley db)
-	DBFLAGS=-DBERK_DB_DBM
-fi
-AC_SUBST(DBFLAGS)dnl
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
-AC_MSG_CHECKING([for missing dbm_error prototype])
-if test "$ac_cv_func_dbm_open" = yes; then
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <ndbm.h>
-int dbm_error();],
-[dbm_error();], AC_DEFINE([MISSING_ERROR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-else
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <dbm.h>
-int dbm_error();],
-[dbm_error();], AC_DEFINE([MISSING_ERROR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-fi
-AC_MSG_CHECKING([for missing dbm_clearerr prototype])
-if test "$ac_cv_func_dbm_open" = yes; then
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <ndbm.h>
-int dbm_clearerr();],
-[dbm_clearerr();], AC_DEFINE([MISSING_CLEARERR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-else
-	AC_EGREP_HEADER([dbm_error], [ndbm.h],
-	AC_MSG_RESULT(no), AC_TRY_LINK(
-[#include <dbm.h>
-int dbm_clearerr();],
-[dbm_clearerr();], AC_DEFINE([MISSING_CLEARERR_PROTO])
-AC_MSG_RESULT(yes), AC_MSG_RESULT(no)))
-fi
-dnl
+WITH_DB
 V5_USE_SHARED_LIB
 AC_CHECK_FUNCS(srand48 srand srandom umask)
 LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb)
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 9fd7e7dcd..225c18c22 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,5 +1,4 @@
-DBFLAGS=@DBFLAGS@
-CFLAGS = $(CCOPTS) $(DEFS) $(DBFLAGS) -DAN_TO_LN_RULES
+CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index c356bfc4d..a41dd6173 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -7,20 +7,8 @@ AC_HAVE_HEADERS(unistd.h sys/time.h regex.h regexp.h)
 AC_HAVE_FUNCS(re_comp regcomp)
 AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
-AC_ARG_WITH([aname-dbm],
-[  --with-aname-dbm		use native dbm for aname_to_lname database
-  --without-aname-dbm		use included version of Berkeley db (default)],
-,
-withval=no)dnl
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Using native dbm for aname_to_lname database)
-	DBFLAGS=
-else
-	AC_MSG_RESULT(Using Berkeley db for aname_to_lname database)
-	DBFLAGS=-DBERK_DB_DBM
-fi
-AC_SUBST(DBFLAGS)dnl
-dnl
+USE_ANAME
+AC_DEFINE(AN_TO_LN_RULES)
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE