Changeset 165 for branches/samba-3.0/source/configure.in

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/configure.in (modified) (4 diffs)

branches/samba-3.0/source/configure.in

@@ -315 +315 @@
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
+AC_SUBST(CIFSUPCALL_PROGS)
+AC_SUBST(INSTALL_CIFSUPCALL)
+AC_SUBST(UNINSTALL_CIFSUPCALL)
 AC_SUBST(EXTRA_SBIN_PROGS)
 AC_SUBST(EXTRA_ALL_TARGETS)
@@ -2870 +2873 @@
 # look for a method of setting the effective uid
 seteuid=no;
+
+if test $seteuid = no; then
+AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
+AC_TRY_RUN([
+#define AUTOCONF_TEST 1
+#define USE_SETREUID 1
+#include "confdefs.h"
+#include "${srcdir-.}/lib/util_sec.c"],
+           samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
+if test x"$samba_cv_USE_SETREUID" = x"yes"; then
+    seteuid=yes;AC_DEFINE(USE_SETREUID,1,[Whether setreuid() is available])
+fi
+fi
+
+# we check for setresuid second as it conflicts with AIO on Linux. 
+# see http://samba.org/~tridge/junkcode/aio_uid.c
 if test $seteuid = no; then
 AC_CACHE_CHECK([for setresuid],samba_cv_USE_SETRESUID,[
@@ -2880 +2899 @@
 if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
     seteuid=yes;AC_DEFINE(USE_SETRESUID,1,[Whether setresuid() is available])
-fi
-fi
-
-
-if test $seteuid = no; then
-AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
-AC_TRY_RUN([
-#define AUTOCONF_TEST 1
-#define USE_SETREUID 1
-#include "confdefs.h"
-#include "${srcdir-.}/lib/util_sec.c"],
-           samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
-if test x"$samba_cv_USE_SETREUID" = x"yes"; then
-    seteuid=yes;AC_DEFINE(USE_SETREUID,1,[Whether setreuid() is available])
 fi
 fi
@@ -4219 +4224 @@
         INSTALL_CIFSMOUNT="installcifsmount"
         UNINSTALL_CIFSMOUNT="uninstallcifsmount"
+        ;;
+  *)
+        AC_MSG_RESULT(no)
+        ;;
+  esac ]
+)
+
+#################################################
+# check for cifs.upcall support
+AC_CHECK_HEADERS([keyutils.h], [HAVE_KEYUTILS_H=1], [HAVE_KEYUTILS_H=0])
+CIFSUPCALL_PROGS=""
+INSTALL_CIFSUPCALL=""
+UNINSTALL_CIFSUPCALL=""
+AC_MSG_CHECKING(whether to build cifs.upcall)
+AC_ARG_WITH(cifsupcall,
+[  --with-cifsupcall       Include cifs.upcall (Linux only) support (default=yes)],
+[ case "$withval" in
+  no)
+        AC_MSG_RESULT(no)
+        ;;
+  *)
+        case "$host_os" in
+        *linux*)
+                if test x"$use_ads" != x"yes"; then
+                        AC_MSG_ERROR(ADS support should be enabled for building cifs.upcall)
+                elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+                        AC_MSG_ERROR(keyutils package is required for cifs.upcall)
+                else
+                        AC_MSG_RESULT(yes)
+                        AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
+                        CIFSUPCALL_PROGS="bin/cifs.upcall"
+                        INSTALL_CIFSUPCALL="installcifsupcall"
+                        UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+                fi
+                ;;
+        *)
+                AC_MSG_ERROR(not on a linux system!)
+                ;;
+        esac
+    ;;
+  esac ],
+[ case "$host_os" in
+  *linux*)
+        if test x"$use_ads" != x"yes"; then
+                AC_MSG_WARN(ADS support should be enabled for building cifs.upcall)
+        elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+                AC_MSG_WARN(keyutils package is required for cifs.upcall)
+        else
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
+                CIFSUPCALL_PROGS="bin/cifs.upcall"
+                INSTALL_CIFSUPCALL="installcifsupcall"
+                UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+        fi
         ;;
   *)