Deactivate CNID backends db3 and last.

Conditionally compile backends.
Default backend: dbd.

diff --git a/configure.in b/configure.in
index 30bcea5e019856a1cd14d024caa40c124d4f19c9..25ccb4de369cc5817b82136aa82a9a05a2d7296c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.228 2009-11-17 16:28:23 franklahm Exp $
+dnl $Id: configure.in,v 1.229 2009-11-23 10:20:15 franklahm Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -1238,12 +1238,10 @@ AC_OUTPUT([Makefile
        libatalk/asp/Makefile
        libatalk/atp/Makefile
        libatalk/cnid/Makefile
-       libatalk/cnid/db3/Makefile
        libatalk/cnid/cdb/Makefile
        libatalk/cnid/last/Makefile
        libatalk/cnid/mtab/Makefile
        libatalk/cnid/dbd/Makefile
-       libatalk/cnid/hash/Makefile
        libatalk/cnid/tdb/Makefile
        libatalk/compat/Makefile
        libatalk/dsi/Makefile

diff --git a/libatalk/cnid/Makefile.am b/libatalk/cnid/Makefile.am
index 1cb310afbf178a3e7fe306d6b19d48acabe577be..a473b37fed8b2b29f964a393d62cdcf7a6c59fd5 100644 (file)
--- a/libatalk/cnid/Makefile.am
+++ b/libatalk/cnid/Makefile.am
@@ -1,17 +1,26 @@
 # Makefile.am for libatalk/cnid/
 
-
-SUBDIRS = db3 last mtab cdb dbd hash tdb
+SUBDIRS = last mtab cdb dbd tdb
 
 noinst_LTLIBRARIES = libcnid.la
 
-LIBCNID_DEPS = db3/libcnid_db3.la \
-               cdb/libcnid_cdb.la \
-               last/libcnid_last.la \
-               mtab/libcnid_mtab.la \
-               hash/libcnid_hash.la \
-               tdb/libcnid_tdb.la \
-               dbd/libcnid_dbd.la 
+LIBCNID_DEPS = dbd/libcnid_dbd.la
+
+if USE_CDB_BACKEND
+LIBCNID_DEPS += cdb/libcnid_cdb.la
+endif
+
+if USE_LAST_BACKEND
+LIBCNID_DEPS += last/libcnid_last.la
+endif
+
+if USE_TDB_BACKEND
+LIBCNID_DEPS += tdb/libcnid_tdb.la
+endif
+
+if USE_MTAB_BACKEND
+LIBCNID_DEPS += mtab/libcnid_mtab.la
+endif
 
 libcnid_la_SOURCES = cnid.c cnid_init.c
 libcnid_la_LIBADD = $(LIBCNID_DEPS)

diff --git a/libatalk/cnid/cdb/Makefile.am b/libatalk/cnid/cdb/Makefile.am
index 555e252a4f9d610c54708eb192b0767faaf3bc69..75b41c112984dcd5bf827acc9189c724d1dc5f7e 100644 (file)
--- a/libatalk/cnid/cdb/Makefile.am
+++ b/libatalk/cnid/cdb/Makefile.am
@@ -1,16 +1,7 @@
 # Makefile.am for libatalk/cnid/
 
-AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@
-
-noinst_LTLIBRARIES = libcnid_cdb.la
-if USE_CDB_BACKEND
-LIBS_db = @BDB_LIBS@
-else
-LIBS_db = 
-endif
-
 libcnid_cdb_la_SOURCES = cnid_cdb_add.c \
-                        cnid_cdb_close.c \
+                    cnid_cdb_close.c \
                         cnid_cdb_delete.c \
                         cnid_cdb_get.c \
                         cnid_cdb_lookup.c \
@@ -19,9 +10,12 @@ libcnid_cdb_la_SOURCES = cnid_cdb_add.c \
                         cnid_cdb_update.c \
                         cnid_cdb_rebuild_add.c \
                         cnid_cdb.h
+libcnid_cdb_la_CFLAGS = @BDB_CFLAGS@
+libcnid_cdb_la_LIBADD = @BDB_LIBS@
 
-noinst_HEADERS = cnid_cdb_meta.h cnid_cdb_private.h 
-
-libcnid_cdb_la_LIBADD = $(LIBS_db)
+if USE_CDB_BACKEND
+noinst_LTLIBRARIES = libcnid_cdb.la
+endif
 
+noinst_HEADERS = cnid_cdb_meta.h cnid_cdb_private.h 
 EXTRA_DIST = README cnid_cdb_meta.c cnid_cdb_nextid.c

diff --git a/libatalk/cnid/db3/Makefile.am b/libatalk/cnid/db3/Makefile.am
index df502f9e886f0f5ac1dfd01e4b95f174fbcfdbf1..ddf0d43abc551e3b7808d629290e00bc77a3b2df 100644 (file)
--- a/libatalk/cnid/db3/Makefile.am
+++ b/libatalk/cnid/db3/Makefile.am
@@ -1,16 +1,7 @@
 # Makefile.am for libatalk/cnid/
 
-AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@
-
-noinst_LTLIBRARIES = libcnid_db3.la
-if USE_CDB_BACKEND
-LIBS_db = @BDB_LIBS@
-else
-LIBS_db = 
-endif
-
 libcnid_db3_la_SOURCES = cnid_db3_add.c \
-                        cnid_db3_close.c \
+                    cnid_db3_close.c \
                         cnid_db3_delete.c \
                         cnid_db3_get.c \
                         cnid_db3_lookup.c \
@@ -18,9 +9,12 @@ libcnid_db3_la_SOURCES = cnid_db3_add.c \
                         cnid_db3_resolve.c \
                         cnid_db3_update.c \
                         cnid_db3.h
+libcnid_db3_la_LIBADD = @BDB_LIBS@
+libcnid_db3_la_CFLAGS = @BDB_CFLAGS@
 
-noinst_HEADERS = cnid_db3_meta.h cnid_db3_private.h 
-
-libcnid_db3_la_LIBADD = $(LIBS_db)
+if USE_DB3_BACKEND
+noinst_LTLIBRARIES = libcnid_db3.la
+endif
 
+noinst_HEADERS = cnid_db3_meta.h cnid_db3_private.h 
 EXTRA_DIST = README cnid_db3_meta.c cnid_db3_nextid.c

diff --git a/libatalk/cnid/hash/Makefile.am b/libatalk/cnid/hash/Makefile.am
index 40dc3b0ba303ff49e5c46667e9b55678353e077a..b3fe93407760aea2b3b5331c40459ced9a1e1459 100644 (file)
--- a/libatalk/cnid/hash/Makefile.am
+++ b/libatalk/cnid/hash/Makefile.am
@@ -1,6 +1,8 @@
 # Makefile.am for libatalk/cnid/
 
+if USE_HASH_BACKEND
 noinst_LTLIBRARIES = libcnid_hash.la
+endif
 
 libcnid_hash_la_SOURCES = cnid_hash_add.c \
                         cnid_hash_close.c \

diff --git a/libatalk/cnid/last/Makefile.am b/libatalk/cnid/last/Makefile.am
index f2c7bb6c54c2849a6b417b25465bc4b59317b04e..0d487b513e848d831f3ffd1a5a480d81b29ceb84 100644 (file)
--- a/libatalk/cnid/last/Makefile.am
+++ b/libatalk/cnid/last/Makefile.am
@@ -1,6 +1,8 @@
 # Makefile.am for libatalk/cnid/
 
+if USE_LAST_BACKEND
 noinst_LTLIBRARIES = libcnid_last.la
+endif
 
 libcnid_last_la_SOURCES = cnid_last.c \
                         cnid_last.h

diff --git a/libatalk/cnid/mtab/Makefile.am b/libatalk/cnid/mtab/Makefile.am
index 0d1ff405cf45dfe46a0ef8088e43f6d2a9e6333f..0d366c0e83e966bc763af04a10cae457a7d7426e 100644 (file)
--- a/libatalk/cnid/mtab/Makefile.am
+++ b/libatalk/cnid/mtab/Makefile.am
@@ -1,6 +1,8 @@
 # Makefile.am for libatalk/cnid/
 
+if USE_MTAB_BACKEND
 noinst_LTLIBRARIES = libcnid_mtab.la
+endif
 
 libcnid_mtab_la_SOURCES = cnid_mtab.c \
                         cnid_mtab.h

diff --git a/libatalk/cnid/tdb/Makefile.am b/libatalk/cnid/tdb/Makefile.am
index 23692fa11524d22c6a0397ae868e70b8b85213c7..58a4f7225215aa33208a19eeeeabd2d2b9172b72 100644 (file)
--- a/libatalk/cnid/tdb/Makefile.am
+++ b/libatalk/cnid/tdb/Makefile.am
@@ -1,9 +1,11 @@
 # Makefile.am for libatalk/cnid/
 
+if USE_TDB_BACKEND
 noinst_LTLIBRARIES = libcnid_tdb.la
+endif
 
 libcnid_tdb_la_SOURCES = cnid_tdb_add.c \
-                        cnid_tdb_close.c \
+                    cnid_tdb_close.c \
                         cnid_tdb_delete.c \
                         cnid_tdb_get.c \
                         cnid_tdb_lookup.c \

diff --git a/macros/cnid-backend.m4 b/macros/cnid-backend.m4
index e05ba8d0d83c202e2772b27e22821e9dc58ea711..7c303df2c9ea900d630ed084a7d111d2602561b1 100644 (file)
--- a/macros/cnid-backend.m4
+++ b/macros/cnid-backend.m4
@@ -4,29 +4,6 @@ AC_DEFUN([AC_NETATALK_CNID], [
     bdb_required=no
     compiled_backends=""
 
-    dnl Determine whether or not to use BDB Concurrent Data Store
-    AC_MSG_CHECKING([whether or not to use BDB Concurrent Data Store])
-    AC_ARG_WITH(cnid-cdb-backend,
-       [  --with-cnid-cdb-backend      build CNID with Concurrent BDB Data Store],[
-           if test x"$withval" = x"no"; then
-               use_cdb_backend=no
-        else
-            use_cdb_backend=yes
-        fi
-    ],[use_cdb_backend=no]
-    )
-
-    if test $use_cdb_backend = yes; then
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(CNID_BACKEND_CDB, 1, [Define if CNID Concurrent BDB backend should be compiled.])        
-        DEFAULT_CNID_SCHEME=cdb
-        bdb_required=yes
-        compiled_backends="$compiled_backends cdb"
-    else
-        AC_MSG_RESULT([no])
-    fi
-    AM_CONDITIONAL(USE_CDB_BACKEND, test x"$use_cdb_backend" = x"yes")
-
     dnl Determine whether or not to use Database Daemon CNID backend
     AC_MSG_CHECKING([whether or not to use Database Daemon CNID backend])
     AC_ARG_WITH(cnid-dbd-backend,
@@ -53,32 +30,30 @@ AC_DEFUN([AC_NETATALK_CNID], [
     fi
     AM_CONDITIONAL(BUILD_DBD_DAEMON, test x"$use_dbd_backend" = x"yes")
 
-    dnl Determine whether or not to use BDB transactional data store
-    AC_MSG_CHECKING([whether or not to use BDB transactional DB store])
-    AC_ARG_WITH(cnid-db3-backend,
-    [  --with-cnid-db3-backend build CNID with transactional BDB Data Store],
-       [
+    dnl Determine whether or not to use BDB Concurrent Data Store
+    AC_MSG_CHECKING([whether or not to use BDB Concurrent Data Store])
+    AC_ARG_WITH(cnid-cdb-backend,
+       [  --with-cnid-cdb-backend      build CNID with Concurrent BDB Data Store],[
            if test x"$withval" = x"no"; then
-            use_db3_backend=no
+               use_cdb_backend=no
         else
-            use_db3_backend=yes
+            use_cdb_backend=yes
         fi
-    ],[
-        use_db3_backend=no
-    ])
+    ],[use_cdb_backend=no]
+    )
 
-    if test x"$use_db3_backend" = x"yes"; then
+    if test $use_cdb_backend = yes; then
         AC_MSG_RESULT([yes])
-        AC_DEFINE(CNID_BACKEND_DB3, 1, [Define if CNID transactional BDB backend should be compiled.])
+        AC_DEFINE(CNID_BACKEND_CDB, 1, [Define if CNID Concurrent BDB backend should be compiled.])        
         if test x"$DEFAULT_CNID_SCHEME" = x; then
-            DEFAULT_CNID_SCHEME=db3
+            DEFAULT_CNID_SCHEME=cdb
         fi
-        compiled_backends="$compiled_backends db3"
         bdb_required=yes
+        compiled_backends="$compiled_backends cdb"
     else
         AC_MSG_RESULT([no])
     fi
-    AM_CONDITIONAL(USE_DB3_BACKEND, test x"$use_db3_backend" = x"yes")
+    AM_CONDITIONAL(USE_CDB_BACKEND, test x"$use_cdb_backend" = x"yes")
 
     dnl Determine whether or not to use LAST DID scheme
     AC_MSG_CHECKING([whether or not to use LAST DID scheme])
@@ -104,31 +79,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     else
         AC_MSG_RESULT([no])
     fi
-
-    dnl Determine whether or not to use HASH DID scheme
-    AC_MSG_CHECKING([whether or not to use HASH DID scheme])
-    AC_ARG_WITH(cnid-hash-backend,
-       [  --with-cnid-hash-backend     build HASH CNID scheme],
-       [
-        if test x"$withval" = x"no"; then
-            use_hash_backend=no
-        else
-            use_hash_backend=yes
-        fi
-    ],[
-        use_hash_backend=no
-    ])
-
-    if test $use_hash_backend = yes; then
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(CNID_BACKEND_HASH, 1, [Define if CNID HASH scheme backend should be compiled.])
-        if test x"$DEFAULT_CNID_SCHEME" = x; then
-            DEFAULT_CNID_SCHEME=hash
-        fi
-        compiled_backends="$compiled_backends hash"
-    else
-        AC_MSG_RESULT([no])
-    fi
+    AM_CONDITIONAL(USE_LAST_BACKEND, test x"$use_last_backend" = x"yes")
 
     dnl Determine whether or not to use TDB DID scheme
     AC_MSG_CHECKING([whether or not to use TDB DID scheme])
@@ -154,6 +105,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     else
         AC_MSG_RESULT([no])
     fi
+    AM_CONDITIONAL(USE_TDB_BACKEND, test x"$use_tdb_backend" = x"yes")
 
     dnl Determine whether or not to use MTAB DID scheme
     AC_MSG_CHECKING([whether or not to use MTAB DID scheme])
@@ -179,6 +131,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     else               
         AC_MSG_RESULT([no])
     fi
+    AM_CONDITIONAL(USE_MTAB_BACKEND, test x"$use_mtab_backend" = x"yes")
 
     dnl Set default DID scheme
     AC_MSG_CHECKING([default DID scheme])