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

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

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

vendor/current/source3/configure.in

@@ -26 +26 @@
 AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
 
-m4_include(../lib/tevent/libtevent.m4)
-
-LIBTEVENT_OBJ0=""
-for obj in ${TEVENT_OBJ}; do
-        LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-done
-AC_SUBST(LIBTEVENT_OBJ0)
-LIBS="${LIBS} ${TEVENT_LIBS}"
-
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
@@ -232 +222 @@
 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>&1 < /dev/null | grep "GNU ld"`
+        ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
+        # we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
+        if test -z "$ac_cv_gnu_ld_version" ; then
+          ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
+        fi
         AC_MSG_CHECKING(GNU ld release date)
         changequote(,)dnl
@@ -753 +747 @@
 
 dnl check for OS implementation of md5 conformant to rfc1321
-AC_CHECK_HEADERS(md5.h)
-
 samba_cv_md5lib=none
 
-if test x"$ac_cv_header_md5_h" = x"yes"; then
-        AC_DEFINE(HAVE_MD5_H, 1,
-                [Whether md5.h is available.])
+AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
+
+if test x"$samba_cv_md5lib" = x"none" ; then
+        AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
+fi
+
+if test x"$samba_cv_md5lib" = x"none" ; then
         AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
 fi
 
+if test x"$samba_cv_md5lib" != x"none" ; then
+        AC_CHECK_HEADERS(md5.h)
+fi
+
+CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
-        AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
-fi
-
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
-        AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
-fi
-
-if test x"$samba_cv_md5lib" != x"none" ; then
+        x"$samba_cv_md5lib" != x"none" ; then
         if test x"$samba_cv_md5lib" != x ; then
                 LIBS="${LIBS} -l${samba_cv_md5lib}"
+                AC_DEFINE(HAVE_LIBMD5, 1,
+                                  [Whether libmd5 conformant to rfc1321 is available.])
         fi
         CRYPTO_MD5_OBJ=
-        AC_DEFINE(HAVE_LIBMD5, 1,
-            [Whether libmd5 conformant to rfc1321 is available.])
-else
-        CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
 
@@ -1117 +1107 @@
 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)
+AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt posix_openpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
 AC_CHECK_FUNCS(fallocate fallocate64)
 AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
@@ -2156 +2146 @@
 fi
 
+AC_ARG_ENABLE(external_libtevent,
+        [AS_HELP_STRING([--enable-external-libtevent],
+                [Enable external tevent [default=auto]])],
+        [ enable_external_libtevent=$enableval ],
+        [ enable_external_libtevent=auto ])
+
+if test "x$enable_external_libtevent" != xno
+then
+        PKG_CHECK_MODULES(LIBTEVENT, tevent >= 0.9.11,
+                [ enable_external_libtevent=yes ],
+                [ if test x$enable_external_libtevent = xyes; then
+                        AC_MSG_ERROR([Unable to find libtevent])
+                  else
+                        enable_external_libtevent=no
+                  fi
+                ])
+fi
+
+if test "x$enable_external_libtevent" = xno
+then
+        m4_include(../lib/tevent/libtevent.m4)
+        if test x"$USESHARED" = x"no" ; then
+                LINK_LIBTEVENT=STATIC
+        fi
+        LIBTEVENTVERSION=`grep ^VERSION ${teventdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
+        SMB_LIBRARY(tevent, 0, ${LIBTEVENTVERSION})
+        LIBTEVENT_OBJ0=""
+        for obj in ${TEVENT_OBJ}; do
+                LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
+        done
+        SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
+        SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CONFIGURE_CPPFLAGS} ${TEVENT_CFLAGS}"
+        AC_SUBST(LIBTEVENT_OBJ0)
+fi
+
 
 AC_ARG_ENABLE(external_libtdb,
@@ -4157 +4182 @@
   fi
 
+  AC_CACHE_CHECK([for ENCTYPE_AES128_CTS_HMAC_SHA1_96],
+                 samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,[
+    AC_TRY_COMPILE([#include <krb5.h>],
+      [krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;],
+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes,
+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no)])
+  if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then
+    AC_DEFINE(HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,1,
+              [Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is available])
+  fi
+  AC_CACHE_CHECK([for ENCTYPE_AES256_CTS_HMAC_SHA1_96],
+                 samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,[
+    AC_TRY_COMPILE([#include <krb5.h>],
+      [krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;],
+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes,
+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no)])
+  if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then
+    AC_DEFINE(HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,1,
+              [Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is available])
+  fi
+
   AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY],
                  samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[
@@ -4831 +4877 @@
     AC_MSG_ERROR([argument to --with-syslog-facility must be a string])
   else
+     AC_MSG_RESULT([$withval])
      if test "$withval" != "yes" ; then
         syslog_facility="$withval"
@@ -4836 +4883 @@
      fi
   fi
-])
+],
+AC_MSG_RESULT(no)
+)
 
 #################################################
@@ -5861 +5910 @@
                         AC_MSG_CHECKING(for aio_suspend)
                         AC_LINK_IFELSE([#include <aio.h>
-int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }],
+int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }],
 [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)])