only compile cnid_metad and cnid_dbd daemons if --with-cnid-dbd-* has been configured

diff --git a/configure.in b/configure.in
index 891c9c04229301c3f2696b113db1f1771a63a106..4bfe944aa220a46e35afda69b89aac298c5b6034 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.4 2003-09-13 02:46:27 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.5 2003-09-20 02:54:51 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -86,7 +86,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h errno.h sys/errno.h)
+AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h errno.h sys/errno.h sys/uio.h)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -321,6 +321,7 @@ if test $use_dbd_backend = yes; then
     fi
     bdb_required=yes
 fi
+AM_CONDITIONAL(BUILD_DBD_DAEMON, test x"$use_dbd_backend" = x"yes")
 
 dnl Determine whether or not to use DB3 transactional data store
 AC_MSG_CHECKING([whether or not to use DB3 transactional DB store])

diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index 1758166b37d857abc1ae1ea7fa60b76c031af56d..d376bca849371e036733d76d50be627d4deb8a7b 100644 (file)
--- a/etc/cnid_dbd/Makefile.am
+++ b/etc/cnid_dbd/Makefile.am
@@ -1,6 +1,10 @@
 # Makefile.am for etc/cnid_dbd/
 
+if BUILD_DBD_DAEMON
 sbin_PROGRAMS = cnid_dbd cnid_metad
+else
+sbin_PROGRAMS =
+endif
 
 cnid_dbd_SOURCES = dbif.c pack.c comm.c usockfd.c db_param.c main.c \
                    dbd_add.c dbd_get.c dbd_resolve.c dbd_lookup.c \
@@ -20,3 +24,4 @@ LIBS = @LIBS@ @BDB_LIBS@
 
 
 CFLAGS = -I$(top_srcdir)/include @CFLAGS@ @BDB_CFLAGS@ 
+