Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 22 Oct 2013 18:02:59 +0000 (20:02 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 22 Oct 2013 18:02:59 +0000 (20:02 +0200)
Conflicts:
configure.ac
libatalk/Makefile.am

1  2 
NEWS
configure.ac
libatalk/Makefile.am
macros/netatalk.m4
macros/summary.m4

diff --cc NEWS
Simple merge
diff --cc configure.ac
index 6eec7f4eeea3768d7bd0cc169c293d3822f7ee35,6f56cdc3e85b6e4d90eed5d4b9d563247016e8a5..cbbc67719ab3bc34d7d3f7de0bcbd55bdbe15be9
@@@ -184,9 -182,9 +184,12 @@@ AC_NETATALK_SENDFIL
  dnl Check whether bundled libevent shall not be used
  AC_NETATALK_LIBEVENT
  
+ dnl Check whether bundled tdb shall be used
+ AC_NETATALK_TDB
 +dnl Check for Tracker
 +AC_NETATALK_SPOTLIGHT
 +
  dnl libatalk API checks
  AC_DEVELOPER
  
index f7206d30017358d325026647e42f69a83d240275,62f1af30c9f23d65c9d149831cf62607d9f70926..d8733b35e92d66f5f67e5415e0b64503bcb4268a
@@@ -34,7 -34,7 +34,7 @@@ VERSION_INFO = 6:0:
  #   3.0.4           5:0:0
  #   3.0.5           6:0:0
  
- SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
 -SUBDIRS = acl adouble bstring compat cnid dsi iniparser util unicode vfs
++SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc util unicode vfs
  
  lib_LTLIBRARIES = libatalk.la
  
@@@ -52,8 -52,6 +52,7 @@@ libatalk_la_LIBADD  = 
        compat/libcompat.la     \
        dsi/libdsi.la           \
        iniparser/libiniparser.la \
-       tdb/libtdb.la       \
 +      talloc/libtalloc.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
@@@ -65,9 -63,7 +64,8 @@@ libatalk_la_DEPENDENCIES = 
        cnid/libcnid.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
 +      talloc/libtalloc.la       \
        iniparser/libiniparser.la \
-       tdb/libtdb.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
Simple merge
Simple merge