svn commit: lorikeet r337 - in trunk/heimdal/cf: .

[lha at samba.org]

Author: lha
Date: 2005-06-14 04:27:36 +0000 (Tue, 14 Jun 2005)
New Revision: 337

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=337

Log:
Fix merge problem from last import (copy file from heimdal)

Modified:
   trunk/heimdal/cf/db.m4


Changeset:
Modified: trunk/heimdal/cf/db.m4
===================================================================
--- trunk/heimdal/cf/db.m4	2005-06-12 11:13:28 UTC (rev 336)
+++ trunk/heimdal/cf/db.m4	2005-06-14 04:27:36 UTC (rev 337)
@@ -100,74 +100,69 @@
 
 fi # berkeley db
 
-AC_ARG_ENABLE(ndbm-db,
-                       AS_HELP_STRING([--disable-ndbm-db],
-                                      [if you don't want ndbm db]),[
-])
-
 if test "$enable_ndbm_db" != "no"; then
- if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
 
-  AC_CHECK_HEADERS([				\
-	dbm.h					\
-	ndbm.h					\
-  ])
+  if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
 
-  AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
-  #include <stdio.h>
-  #if defined(HAVE_NDBM_H)
-  #include <ndbm.h>
-  #elif defined(HAVE_DBM_H)
-  #include <dbm.h>
-  #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
-
     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 <stdio.h>
-    #include <gdbm/ndbm.h>
+    #if defined(HAVE_NDBM_H)
+    #include <ndbm.h>
+    #elif defined(HAVE_DBM_H)
+    #include <dbm.h>
+    #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 <stdio.h>
+      #include <gdbm/ndbm.h>
+      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
 
- fi # unknown
-fi
-
 if test "$have_ndbm" = "yes"; then
   AC_MSG_CHECKING([if ndbm is implemented with db])
   AC_RUN_IFELSE([AC_LANG_SOURCE([[