diff options
| author | Richard Basch <probe@mit.edu> | 1996-01-22 04:42:57 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1996-01-22 04:42:57 +0000 |
| commit | 99deb652aed6395120f957f211dbd604e4aa8774 (patch) | |
| tree | c66bc10bd69472ed21e1379a1f204922f0831902 /src/lib/kdb | |
| parent | 412fffc7d49c8452d42c42ba7f2e74aff1c5d1ae (diff) | |
| download | krb5-99deb652aed6395120f957f211dbd604e4aa8774.tar.gz krb5-99deb652aed6395120f957f211dbd604e4aa8774.tar.xz krb5-99deb652aed6395120f957f211dbd604e4aa8774.zip | |
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
Diffstat (limited to 'src/lib/kdb')
| -rw-r--r-- | src/lib/kdb/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/kdb/configure.in | 49 |
2 files changed, 2 insertions, 50 deletions
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index e450ad6e4d..3e96d8a7c8 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 4b45a6a1e3..504755a564 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) |