X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fcnid-backend.m4;h=c87e457c598c0832985228832bfeb867e7f57360;hb=ff0beccf80895a25830c952ce93f314a2d8fe0a6;hp=7c303df2c9ea900d630ed084a7d111d2602561b1;hpb=6b1ac16a9b4d5223453b69b56223165c513f9dc4;p=netatalk.git

diff --git a/macros/cnid-backend.m4 b/macros/cnid-backend.m4
index 7c303df2..c87e457c 100644
--- a/macros/cnid-backend.m4
+++ b/macros/cnid-backend.m4
@@ -1,5 +1,4 @@
 AC_DEFUN([AC_NETATALK_CNID], [
-
     dnl Don't use BDB unless it's needed
     bdb_required=no
     compiled_backends=""
@@ -7,10 +6,10 @@ AC_DEFUN([AC_NETATALK_CNID], [
     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,
-    [  --with-cnid-dbd-backend       build CNID with Database Daemon Data Store],
+    [  --with-cnid-dbd-backend       build CNID with Database Daemon Data Store [[yes]]],
     [   if test x"$withval" = x"no"; then
-            AC_MSG_RESULT([no])
             use_dbd_backend=no
+            AC_MSG_RESULT([no])
         else
             use_dbd_backend=yes
             AC_MSG_RESULT([yes])
@@ -33,14 +32,16 @@ AC_DEFUN([AC_NETATALK_CNID], [
     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],[
+	[  --with-cnid-cdb-backend	build CNID with Concurrent BDB Data Store  [[no]]],[
 	    if test x"$withval" = x"no"; then
 	        use_cdb_backend=no
         else
             use_cdb_backend=yes
         fi
-    ],[use_cdb_backend=no]
-    )
+    ],[
+        use_cdb_backend=no
+    ])
+
 
     if test $use_cdb_backend = yes; then
         AC_MSG_RESULT([yes])
@@ -58,7 +59,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use LAST DID scheme
     AC_MSG_CHECKING([whether or not to use LAST DID scheme])
     AC_ARG_WITH(cnid-last-backend,
-	[  --with-cnid-last-backend	build LAST CNID scheme],
+	[  --with-cnid-last-backend	build LAST CNID scheme                     [[yes]]],
 	[
         if test x"$withval" = x"no"; then
             use_last_backend=no
@@ -84,7 +85,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use TDB DID scheme
     AC_MSG_CHECKING([whether or not to use TDB DID scheme])
     AC_ARG_WITH(cnid-tdb-backend,
-	[  --with-cnid-tdb-backend	build DID CNID scheme],
+	[  --with-cnid-tdb-backend	build TDB CNID scheme                      [[yes]]],
     [
         if test x"$withval" = x"no"; then
             use_tdb_backend=no
@@ -92,13 +93,13 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_tdb_backend=yes
         fi
     ],[
-        use_tdb_backend=no
+        use_tdb_backend=yes
     ])
 
     if test $use_tdb_backend = yes; then
         AC_MSG_RESULT([yes])
         AC_DEFINE(CNID_BACKEND_TDB, 1, [Define if CNID TDB scheme backend should be compiled.])
-        if test x"$DEFAULT_TDB_SCHEME" = x; then
+        if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=tdb
         fi
         compiled_backends="$compiled_backends tdb"
@@ -107,36 +108,43 @@ AC_DEFUN([AC_NETATALK_CNID], [
     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])
-    AC_ARG_WITH(cnid-mtab-backend,
-	[  --with-cnid-mtab-backend	build MTAB CNID scheme],
-    [
-        if test x"$withval" = x"no"; then
-            use_mtab_backend=no
-        else
-            use_mtab_backend=yes
-        fi
-    ],[
-        use_mtab_backend=no
-    ])
+    dnl Check for mysql CNID backend
+    AC_ARG_VAR(MYSQL_CFLAGS, [C compiler flags for MySQL, overriding checks])
+    AC_ARG_VAR(MYSQL_LIBS, [linker flags for MySQL, overriding checks])
 
-    if test $use_mtab_backend = yes; then
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(CNID_BACKEND_MTAB, 1, [Define if CNID MTAB scheme backend should be compiled.])
-        if test x"$DEFAULT_CNID_SCHEME" = x; then
-            DEFAULT_CNID_SCHEME=mtab
-        fi
-        compiled_backends="$compiled_backends mtab"
-    else		
-        AC_MSG_RESULT([no])
+    AC_MSG_CHECKING([MySQL library and headers])
+    AC_ARG_WITH(
+        mysql-config,
+        [AS_HELP_STRING([--with-mysql-config=PATH],[Path to mysql-config binary (default: mysql_config)])],
+        MYSQL_CONFIG=$withval
+    )
+
+    if test -z "$MYSQL_CONFIG" -a -z "$MYSQL_CFLAGS" -a -z "$MYSQL_LIBS" ; then
+        AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
+    fi
+
+    if test -x "$MYSQL_CONFIG" ; then
+        AC_MSG_RESULT([$MYSQL_CONFIG])
+        MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
+        MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
+        ac_cv_with_cnid_mysql="yes"
+    elif test -n "$MYSQL_CFLAGS" -a -n "$MYSQL_LIBS" ; then
+        ac_cv_with_cnid_mysql="yes"
     fi
-    AM_CONDITIONAL(USE_MTAB_BACKEND, test x"$use_mtab_backend" = x"yes")
+
+    if test x"$ac_cv_with_cnid_mysql" = x"yes" ; then
+        compiled_backends="$compiled_backends mysql"
+        AC_DEFINE(CNID_BACKEND_MYSQL, 1, [whether the MySQL CNID module is available])
+    fi
+
+    AC_SUBST(MYSQL_CFLAGS)
+    AC_SUBST(MYSQL_LIBS)
+    AM_CONDITIONAL(USE_MYSQL_BACKEND, test x"$ac_cv_with_cnid_mysql" = x"yes")
 
     dnl Set default DID scheme
     AC_MSG_CHECKING([default DID scheme])
     AC_ARG_WITH(cnid-default-backend,
-	[  --with-cnid-default-backend=val	set default DID scheme],
+	[  --with-cnid-default-backend=val	set default DID scheme [[dbd]]],
     [
         if test x"$withval" = x; then
             AC_MSG_RESULT([ignored])