Changeset 228 for branches/samba-3.2.x/source/configure.in

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/configure.in (modified) (7 diffs)

branches/samba-3.2.x/source/configure.in

@@ -405 +405 @@
 
 dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr"
+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_smb_traffic_analyzer"
 
 if test "x$developer" = xyes; then
@@ -757 +757 @@
 
         if test "x$CUPS_CONFIG" != x; then
-                AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
+
+                ac_save_CFLAGS=$CFLAGS
+                ac_save_LDFLAGS=$LDFLAGS
+                ac_save_PRINT_LIBS=$PRINT_LIBS
                 CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
                 LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
                 PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
+                AC_CHECK_HEADERS(cups/cups.h cups/language.h)
+                if test x"$ac_cv_header_cups_cups_h" = xyes -a \
+                        x"$ac_cv_header_cups_language_h" = xyes; then
+                        AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
+                        samba_cv_HAVE_CUPS=yes
+                else
+                        AC_MSG_WARN([cups-config around but cups-devel not installed])
+                        CFLAGS=$ac_save_CFLAGS
+                        LDFLAGS=$ac_save_LDFLAGS
+                        PRINT_LIBS=$ac_save_PRINT_LIBS
+                fi
+
         elif test x"$enable_cups" = x"yes"; then
                 AC_MSG_ERROR(Cups support required but cups-config not located.  Make sure cups-devel related files are installed.)
@@ -770 +785 @@
 
 if test x$enable_iprint != xno; then
-        if test "x$CUPS_CONFIG" != x; then
+        if test x"$samba_cv_HAVE_CUPS" = xyes; then
                 AC_DEFINE(HAVE_IPRINT,1,[Whether we have iPrint])
         elif test x"$enable_iprint" = x"yes"; then
@@ -1039 +1054 @@
 # Find a method of generating a stack trace
 AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
+# libexecinfo provides backtrace_symbols on FreeBSD
+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
@@ -2474 +2491 @@
 
 AC_CACHE_CHECK([for inotify support],samba_cv_HAVE_INOTIFY,[
-AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h)
+AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h sys/inotify.h)
 AC_CHECK_FUNCS(inotify_init)
 AC_HAVE_DECL(__NR_inotify_init, [#include <asm/unistd.h>])
@@ -4351 +4368 @@
   AC_MSG_RESULT(no)
 )
+
+#################################################
+# check for custom syslog facility
+AC_MSG_CHECKING(whether to use a custom syslog facility)
+AC_ARG_WITH(syslog-facility,
+[AS_HELP_STRING([--with-syslog-facility], [Use a custom syslog facility (default=none)])],
+[
+  if test "$withval" = "no" ; then
+    AC_MSG_ERROR([argument to --with-syslog-facility must be a string])
+  else
+     if test "$withval" != "yes" ; then
+        syslog_facility="$withval"
+        AC_DEFINE_UNQUOTED(SYSLOG_FACILITY,$syslog_facility, [syslog facility to log to])
+     fi
+  fi
+])
 
 #################################################
@@ -6078 +6111 @@
 SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
 SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), "bin/smb_traffic_analyzer.$SHLIBEXT", VFS)