* FIX: Disable Kerberos UAM if AFP service principal name can't be
evaluated. Fixes bug #531.
* FIX: Fix handling of large number of volumes. Bug #527.
+* NEW: Configure option --with-tbd which can be used to disable the
+ use of the bundled tdb and use a system installed version.
Changes in 3.0.5
================
dnl Check whether bundled libevent shall not be used
AC_NETATALK_LIBEVENT
+dnl Check whether bundled tdb shall be used
+AC_NETATALK_TDB
+
dnl libatalk API checks
AC_DEVELOPER
-#ifndef __TDB_H__
-#define __TDB_H__
+#ifndef USE_BUILTIN_TDB
+# include <tdb.h>
+#else
+# ifndef __TDB_H__
+# define __TDB_H__
/*
Unix SMB/CIFS implementation.
}
#endif
-#endif /* tdb.h */
+# endif /* tdb.h */
+#endif /* USE_BUILTIN_TDB */
# 3.0.4 5:0:0
# 3.0.5 6:0:0
-SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser util unicode vfs
lib_LTLIBRARIES = libatalk.la
compat/libcompat.la \
dsi/libdsi.la \
iniparser/libiniparser.la \
- tdb/libtdb.la \
unicode/libunicode.la \
util/libutil.la \
vfs/libvfs.la
compat/libcompat.la \
dsi/libdsi.la \
iniparser/libiniparser.la \
- tdb/libtdb.la \
unicode/libunicode.la \
util/libutil.la \
vfs/libvfs.la
libatalk_la_LDFLAGS = -version-info $(VERSION_INFO)
+if USE_BUILTIN_TDB
+SUBDIRS += tdb
+libatalk_la_LIBADD += tdb/libtdb.la
+libatalk_la_DEPENDENCIES += tdb/libtdb.la
+endif
+
if DEVELOPER
all-local: .libs/libatalk.so
@$(top_srcdir)/abigen.sh .libs/libatalk.so > libatalk.abi.tmp
cnid_tdb_update.c \
cnid_tdb.h
+libcnid_tdb_la_CFLAGS = @TDB_CFLAGS@
+libcnid_tdb_la_LIBADD = @TDB_LIBS@
+
EXTRA_DIST = README cnid_tdb_nextid.c
AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
])
+dnl Whether to disable bundled tdb
+AC_DEFUN([AC_NETATALK_TDB], [
+ AC_ARG_WITH(
+ tdb,
+ [AS_HELP_STRING([--with-tdb],[whether to use the bundled tdb (default: yes)])],
+ use_bundled_tdb=$withval,
+ use_bundled_tdb=yes
+ )
+ AC_MSG_CHECKING([whether to use bundled tdb])
+ AC_MSG_RESULT([$use_bundled_tdb])
+
+ if test x"$use_bundled_tdb" = x"yes" ; then
+ AC_DEFINE(USE_BUILTIN_TDB, 1, [Use internal tbd])
+ else
+ if test -z "$TDB_LIBS" ; then
+ PKG_CHECK_MODULES(TDB, tdb, , [AC_MSG_ERROR([couldn't find tdb with pkg-config])])
+ fi
+ use_bundled_tdb=no
+ fi
+
+ AC_SUBST(TDB_CFLAGS)
+ AC_SUBST(TDB_LIBS)
+ AM_CONDITIONAL(USE_BUILTIN_TDB, test x"$use_bundled_tdb" = x"yes")
+])
+
dnl Filesystem Hierarchy Standard (FHS) compatibility
AC_DEFUN([AC_NETATALK_FHS], [
AC_MSG_CHECKING([whether to use Filesystem Hierarchy Standard (FHS) compatibility])
AC_MSG_RESULT([ LIBS = $LIBEVENT_CFLAGS])
AC_MSG_RESULT([ CFLAGS = $LIBEVENT_LDFLAGS])
fi
+
+ AC_MSG_RESULT([ TDB:])
+ if test x"$use_bundled_tdb" = x"yes"; then
+ AC_MSG_RESULT([ bundled])
+ else
+ AC_MSG_RESULT([ LIBS = $TDB_LIBS])
+ AC_MSG_RESULT([ CFLAGS = $TDB_CFLAGS])
+ fi
])