From 0a9f66241a69d95e9af883df1e0bdb0b570f2b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 10 Jun 2005 23:58:37 +0000 Subject: [PATCH] Add an option to disable ndbm, from Stefan Metzmacher git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15362 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cf/db.m4 | 93 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/cf/db.m4 b/cf/db.m4 index 015211ac3..f5f52ed1d 100644 --- a/cf/db.m4 +++ b/cf/db.m4 @@ -8,6 +8,11 @@ AC_ARG_ENABLE(berkeley-db, [if you don't want berkeley db]),[ ]) +AC_ARG_ENABLE(ndbm-db, + AS_HELP_STRING([--disable-ndbm-db], + [if you don't want ndbm db]),[ +]) + have_ndbm=no db_type=unknown @@ -95,65 +100,67 @@ dnl test for ndbm compatability fi # berkeley db -if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then +if test "$enable_ndbm_db" != "no"; then - AC_CHECK_HEADERS([ \ - dbm.h \ - ndbm.h \ - ]) - - AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [ - #include - #if defined(HAVE_NDBM_H) - #include - #elif defined(HAVE_DBM_H) - #include - #endif - DBM *dbm; - ],[NULL]) - - if test "$ac_cv_func_dbm_firstkey" = "yes"; then - if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then - LIB_NDBM="$ac_cv_funclib_dbm_firstkey" - else - LIB_NDBM="" - fi - AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl - have_ndbm=yes - if test "$db_type" = "unknown"; then - db_type=ndbm - DBLIB="$LIB_NDBM" - fi - else - - $as_unset ac_cv_func_dbm_firstkey - $as_unset ac_cv_funclib_dbm_firstkey + if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then AC_CHECK_HEADERS([ \ - gdbm/ndbm.h \ + dbm.h \ + ndbm.h \ ]) - - AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [ + + AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [ #include - #include + #if defined(HAVE_NDBM_H) + #include + #elif defined(HAVE_DBM_H) + #include + #endif DBM *dbm; ],[NULL]) - + if test "$ac_cv_func_dbm_firstkey" = "yes"; then if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then - LIB_NDBM="$ac_cv_funclib_dbm_firstkey" + LIB_NDBM="$ac_cv_funclib_dbm_firstkey" else - LIB_NDBM="" + LIB_NDBM="" fi AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl have_ndbm=yes if test "$db_type" = "unknown"; then - db_type=ndbm - DBLIB="$LIB_NDBM" + db_type=ndbm + DBLIB="$LIB_NDBM" + fi + else + + $as_unset ac_cv_func_dbm_firstkey + $as_unset ac_cv_funclib_dbm_firstkey + + AC_CHECK_HEADERS([ \ + gdbm/ndbm.h \ + ]) + + AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [ + #include + #include + DBM *dbm; + ],[NULL]) + + if test "$ac_cv_func_dbm_firstkey" = "yes"; then + if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then + LIB_NDBM="$ac_cv_funclib_dbm_firstkey" + else + LIB_NDBM="" + fi + AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl + have_ndbm=yes + if test "$db_type" = "unknown"; then + db_type=ndbm + DBLIB="$LIB_NDBM" + fi fi fi - fi - + fi #enable_ndbm_db fi # unknown if test "$have_ndbm" = "yes"; then