Changeset 597 for vendor/current/source3/configure.in

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/configure.in (modified) (3 diffs)

vendor/current/source3/configure.in

@@ -216 +216 @@
 dnl warnings when building modules.
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
-        ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1`
+        ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"`
         AC_MSG_CHECKING(GNU ld release date)
         changequote(,)dnl
@@ -1024 +1024 @@
 AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)
 AC_CHECK_FUNCS(initgroups select poll rdchk getgrnam getgrent pathconf)
+AC_CHECK_FUNCS(getgrset)
 AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
 AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
@@ -2689 +2690 @@
 # Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
 
-SMB_CHECK_DMAPI([], AC_MSG_NOTICE(DMAPI support not present) )
+
+with_dmapi_support=auto
+AC_MSG_CHECKING(whether to use DMAPI support)
+AC_ARG_WITH(dmapi,
+[AS_HELP_STRING([--with-dmapi], [Include DMAPI/XDSM support (default=auto)])],
+[ case "$withval" in
+  yes|no)
+    with_dmapi_support=$withval
+    ;;
+  esac ]
+)
+AC_MSG_RESULT([$with_dmapi_support])
+
+if test x"$with_dmapi_support" != xno ; then
+        SMB_CHECK_DMAPI([], [
+                AC_MSG_NOTICE(DMAPI support not present)
+                if test x"$with_dmapi_support" = xyes ; then
+                        AC_MSG_ERROR(no DMAPI support found but requested!)
+                fi
+                ]
+        )
+fi
 
 # Add TSM SM VFS module only if there are both GPFS and DMAPI support