Ignore:
Timestamp:
Nov 14, 2012, 12:59:34 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to 3.6.0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vendor/current/source3/configure.in

    r618 r740  
    2424
    2525AC_LIBREPLACE_CC_CHECKS
     26AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
    2627
    2728m4_include(../lib/tevent/libtevent.m4)
    … …  
    3738SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
    3839SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
    39 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
    4040SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
    4141SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
    … …  
    7474AC_SUBST(LIBWBCLIENT_STATIC)
    7575AC_SUBST(LIBWBCLIENT_SOVER)
     76AC_SUBST(LIBWBCLIENT_FULLVER)
    7677AC_SUBST(LIBWBCLIENT)
    7778AC_SUBST(LIBWBCLIENT_LIBS)
    … …  
    124125m4_include(m4/swat.m4)
    125126
     127DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
     128
    126129# Probe the gcc version for extra CFLAGS. We always stash these in
    127130# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
    128131# Makefile edit, avoiding the need to re-run configure.
    129132if test x"$ac_cv_prog_gcc" = x"yes" ; then
    130         DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
     133        DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings"
    131134        # Add -Wdeclaration-after-statement if compiler supports it
    132135        AC_CACHE_CHECK(
    … …  
    195198
    196199dnl Checks for programs.
    197 merged_build_possible=yes
     200AC_ARG_ENABLE(smbtorture4,
     201        [AS_HELP_STRING([--enable-smbtorture4], [Enable building smbtorture4 (default=auto)])])
     202
     203if test x$enable_smbtorture4 != xno; then
     204        smbtorture4_possible=yes
     205else
     206        smbtorture4_possible=no
     207fi
    198208
    199209AC_PROG_INSTALL
    … …  
    201211# Check for GNU make
    202212m4_include(../m4/check_make.m4)
    203 AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no])
     213AC_SAMBA_GNU_MAKE([true], [true])
    204214
    205215# Check for perl
    206216m4_include(../m4/check_perl.m4)
    207 AC_SAMBA_PERL([true], [merged_build_possible=no])
     217AC_SAMBA_PERL([true], [smbtorture4_possible=no])
     218
     219# Check for python
     220m4_include(../m4/check_python.m4)
     221AC_SAMBA_PYTHON_DEVEL([true], [smbtorture4_possible=no])
    208222
    209223AC_CHECK_TOOL(AR, ar)
    … …  
    232246           AC_MSG_CHECKING(GNU ld release version)
    233247           changequote(,)dnl
    234            ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
     248           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' | sed -n 's,\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
    235249           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
    236250           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
    … …  
    336350        }
    337351],
    338         samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
     352        samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)])
    339353if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
    340354        AC_MSG_WARN([using --uint-enums for pidl])
    … …  
    396410dnl Add modules that have to be built by default here
    397411dnl These have to be built static:
    398 default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
     412default_static_modules=""
     413default_static_modules="$default_static_modules pdb_smbpasswd"
     414default_static_modules="$default_static_modules pdb_tdbsam"
     415default_static_modules="$default_static_modules pdb_wbc_sam"
     416default_static_modules="$default_static_modules rpc_lsarpc"
     417default_static_modules="$default_static_modules rpc_samr"
     418default_static_modules="$default_static_modules rpc_winreg"
     419default_static_modules="$default_static_modules rpc_initshutdown"
     420default_static_modules="$default_static_modules rpc_dssetup"
     421default_static_modules="$default_static_modules rpc_wkssvc"
     422default_static_modules="$default_static_modules rpc_svcctl"
     423default_static_modules="$default_static_modules rpc_ntsvcs"
     424default_static_modules="$default_static_modules rpc_netlogon"
     425default_static_modules="$default_static_modules rpc_netdfs"
     426default_static_modules="$default_static_modules rpc_srvsvc"
     427default_static_modules="$default_static_modules rpc_spoolss"
     428default_static_modules="$default_static_modules rpc_eventlog"
     429default_static_modules="$default_static_modules auth_sam"
     430default_static_modules="$default_static_modules auth_unix"
     431default_static_modules="$default_static_modules auth_winbind"
     432default_static_modules="$default_static_modules auth_wbc"
     433default_static_modules="$default_static_modules auth_server"
     434default_static_modules="$default_static_modules auth_domain"
     435default_static_modules="$default_static_modules auth_builtin"
     436default_static_modules="$default_static_modules vfs_default"
     437default_static_modules="$default_static_modules nss_info_template"
    399438
    400439dnl These are preferably build shared, and static if dlopen() is not available
    401 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_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
     440default_shared_modules=""
     441default_shared_modules="$default_shared_modules vfs_recycle"
     442default_shared_modules="$default_shared_modules vfs_audit"
     443default_shared_modules="$default_shared_modules vfs_extd_audit"
     444default_shared_modules="$default_shared_modules vfs_full_audit"
     445default_shared_modules="$default_shared_modules vfs_netatalk"
     446default_shared_modules="$default_shared_modules vfs_fake_perms"
     447default_shared_modules="$default_shared_modules vfs_default_quota"
     448default_shared_modules="$default_shared_modules vfs_readonly"
     449default_shared_modules="$default_shared_modules vfs_cap"
     450default_shared_modules="$default_shared_modules vfs_expand_msdfs"
     451default_shared_modules="$default_shared_modules vfs_shadow_copy"
     452default_shared_modules="$default_shared_modules vfs_shadow_copy2"
     453default_shared_modules="$default_shared_modules charset_CP850"
     454default_shared_modules="$default_shared_modules charset_CP437"
     455default_shared_modules="$default_shared_modules auth_script"
     456default_shared_modules="$default_shared_modules vfs_readahead"
     457default_shared_modules="$default_shared_modules vfs_xattr_tdb"
     458default_shared_modules="$default_shared_modules vfs_streams_xattr"
     459default_shared_modules="$default_shared_modules vfs_streams_depot"
     460default_shared_modules="$default_shared_modules vfs_acl_xattr"
     461default_shared_modules="$default_shared_modules vfs_acl_tdb"
     462default_shared_modules="$default_shared_modules vfs_smb_traffic_analyzer"
     463default_shared_modules="$default_shared_modules vfs_preopen"
     464default_shared_modules="$default_shared_modules vfs_catia"
     465default_shared_modules="$default_shared_modules vfs_scannedonly"
     466default_shared_modules="$default_shared_modules vfs_crossrename"
     467default_shared_modules="$default_shared_modules vfs_linux_xfs_sgid"
     468default_shared_modules="$default_shared_modules vfs_time_audit"
     469default_shared_modules="$default_shared_modules idmap_autorid"
    402470
    403471if test "x$developer" = xyes; then
    404472   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
     473   default_static_modules="$default_static_modules auth_netlogond"
    405474   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
    406475fi
    … …  
    458527                                ;;
    459528                        5.*)
     529                        LDFLAGS="$LDFLAGS -lthread"
     530                        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
    460531                        AC_MSG_RESULT([enabling large file support])
    461532                        if test "$ac_cv_prog_gcc" = yes; then
    … …  
    465536                                case "$ac_cv_gcc_compiler_version_number" in
    466537                                        *"gcc version 2.6"*|*"gcc version 2.7"*)
    467                                                 CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
    468                                                 LDFLAGS="$LDFLAGS -lthread"
     538                                                CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
    469539                                                AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
    470540                                                ;;
    471541                                        *)
    472                                                 CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
    473                                                 LDFLAGS="$LDFLAGS -lthread"
     542                                                CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
    474543                                                AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
    475544                                                AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
    … …  
    477546                                esac
    478547                        else
    479                                 CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
    480                                 LDFLAGS="$LDFLAGS -lthread"
     548                                CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
    481549                                AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
    482550                                AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
    … …  
    680748AC_CHECK_HEADERS(xfs/libxfs.h)
    681749AC_CHECK_HEADERS(netgroup.h)
     750AC_CHECK_HEADERS(linux/falloc.h)
    682751
    683752AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
    … …  
    699768# subdirectory of headers.
    700769AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
     770
     771if test x"$enable_developer" = x"yes" ; then
     772   if test x"$ac_cv_header_valgrind_h" = xyes -o \
     773           x"$ac_cv_header_valgrind_valgrind_h" = xyes ; then
     774      AC_DEFINE(VALGRIND,1,[Whether we have valgrind headers])
     775   fi
     776fi
    701777
    702778#
    … …  
    768844                        # required.
    769845                        AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
    770                                 [PRINT_LIBS"$ac_save_PRINT_LIBS -lcups"],
     846                                [PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
    771847                                [AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
    772848                                 PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
    … …  
    882958fi
    883959
    884 AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
    885     AC_TRY_COMPILE([
    886 #include <sys/types.h>
    887 #if STDC_HEADERS
    888 #include <stdlib.h>
    889 #include <stddef.h>
    890 #endif
    891 #if TIME_WITH_SYS_TIME
    892 # include <sys/time.h>
    893 # include <time.h>
    894 #else
    895 # if HAVE_SYS_TIME_H
    896 #  include <sys/time.h>
    897 # else
    898 #  include <time.h>
    899 # endif
    900 #endif
    901 ],[struct timespec ts;],
    902         samba_cv_struct_timespec=yes,samba_cv_struct_timespec=no)])
    903 if test x"$samba_cv_struct_timespec" = x"yes"; then
    904    AC_DEFINE(HAVE_STRUCT_TIMESPEC,1,[Whether we have struct timespec])
    905 fi
    906 
    907960# and glibc has setresuid under linux but the function does
    908961# nothing until kernel 2.1.44! very dumb.
    … …  
    10201073AC_CHECK_FUNCS(strtol)
    10211074AC_CHECK_FUNCS(strchr chflags)
    1022 AC_CHECK_FUNCS(getrlimit fsync fdatasync setpgid)
     1075AC_CHECK_FUNCS(getrlimit fsync setpgid)
     1076AC_CHECK_FUNCS(fdatasync,,[AC_CHECK_LIB_EXT(rt, LIBS, fdatasync)])
    10231077AC_CHECK_FUNCS(setsid glob strpbrk crypt16 getauthuid)
    10241078AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)
    1025 AC_CHECK_FUNCS(initgroups select poll rdchk getgrnam getgrent pathconf)
     1079AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
    10261080AC_CHECK_FUNCS(getgrset)
    10271081AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
    10281082AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
     1083AC_CHECK_FUNCS(fallocate fallocate64)
    10291084AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
    10301085AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
     1086AC_CHECK_FUNCS(fdopendir fdopendir64)
    10311087AC_CHECK_FUNCS(getpwent_r)
    10321088AC_CHECK_FUNCS(getdents64)
    … …  
    10351091AC_CHECK_FUNCS(setlocale nl_langinfo)
    10361092AC_CHECK_FUNCS(nanosleep,,[AC_CHECK_LIB_EXT(rt, LIBS, nanosleep)])
    1037 AC_CHECK_FUNCS(utimensat)
     1093AC_CHECK_FUNCS(lutimes futimes utimensat futimens)
    10381094AC_CHECK_FUNCS(mlock munlock mlockall munlockall)
    10391095AC_CHECK_FUNCS(memalign posix_memalign hstrerror)
    … …  
    10551111AC_CHECK_FUNCS(sysctlbyname)
    10561112
     1113#################################################
     1114# Check to see if core dump directory is defined in linux
     1115# with /proc/sys/kernel/core_pattern
     1116
     1117AC_CHECK_FILE([/proc/sys/kernel/core_pattern],
     1118        AC_DEFINE(HAVE_SYS_KERNEL_PROC_CORE_PATTERN, 1,
     1119        [Whether Linux kernel uses core_pattern for core files]),
     1120         [])
     1121
    10571122#############################
    10581123# check if building with gpfs
    … …  
    10611126    AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL headers are available])
    10621127    default_shared_modules="$default_shared_modules vfs_gpfs"
     1128    default_shared_modules="$default_shared_modules vfs_gpfs_hsm_notify"
    10631129fi
    10641130
    … …  
    13811447
    13821448############################################
    1383 # Check if we have libattr
     1449# Check for EA implementations
    13841450case "$host_os" in
    13851451  *osf*)
    … …  
    13891455        AC_CHECK_FUNCS(sizeof_proplist_entry)
    13901456  ;;
     1457  *freebsd4* | *dragonfly* )
     1458        AC_DEFINE(BROKEN_EXTATTR, 1, [Does extattr API work])
     1459  ;;
     1460  *solaris*)
     1461        AC_CHECK_FUNCS(attropen)
     1462  ;;
    13911463  *)
    13921464        AC_SEARCH_LIBS(getxattr, [attr])
    1393         AC_CHECK_FUNCS(getxattr lgetxattr fgetxattr listxattr llistxattr)
    1394         AC_CHECK_FUNCS(getea fgetea lgetea listea flistea llistea)
    1395         AC_CHECK_FUNCS(removeea fremoveea lremoveea setea fsetea lsetea)
    1396         AC_CHECK_FUNCS(flistxattr removexattr lremovexattr fremovexattr)
    1397         AC_CHECK_FUNCS(setxattr lsetxattr fsetxattr)
    1398         AC_CHECK_FUNCS(attr_get attr_list attr_set attr_remove)
    1399         AC_CHECK_FUNCS(attr_getf attr_listf attr_setf attr_removef)
    1400   ;;
    1401 esac
    1402 
    1403 ########################################################
    1404 # Check if attropen() is present if this is Solaris
    1405 case "$host_os" in
    1406   *solaris*)
    1407         AC_CHECK_FUNCS(attropen)
     1465        AC_CHECK_FUNCS(getxattr,[
     1466                AC_CHECK_FUNCS(lgetxattr fgetxattr listxattr llistxattr flistxattr removexattr lremovexattr fremovexattr setxattr lsetxattr fsetxattr)
     1467                ])
     1468        AC_CHECK_FUNCS(getea,[
     1469                AC_CHECK_FUNCS(fgetea lgetea listea flistea llistea removeea fremoveea lremoveea setea fsetea lsetea)
     1470                ])
     1471        AC_CHECK_FUNCS(attr_get,[
     1472                AC_CHECK_FUNCS(attr_list attr_set attr_remove attr_getf attr_listf attr_setf attr_removef)
     1473                ])
     1474        AC_CHECK_FUNCS(extattr_delete_file,[
     1475                AC_CHECK_FUNCS(extattr_delete_fd extattr_delete_link extattr_get_fd extattr_get_file extattr_get_link extattr_list_fd extattr_list_file extattr_list_link extattr_set_fd extattr_set_file extattr_set_link)
     1476                ])
    14081477  ;;
    14091478esac
    … …  
    14321501        fi
    14331502fi
    1434 
    1435 # Check if we have extattr
    1436 case "$host_os" in
    1437   *freebsd4* | *dragonfly* )
    1438     AC_DEFINE(BROKEN_EXTATTR, 1, [Does extattr API work])
    1439     ;;
    1440   *)
    1441     AC_CHECK_FUNCS(extattr_delete_fd extattr_delete_file extattr_delete_link)
    1442     AC_CHECK_FUNCS(extattr_get_fd extattr_get_file extattr_get_link)
    1443     AC_CHECK_FUNCS(extattr_list_fd extattr_list_file extattr_list_link)
    1444     AC_CHECK_FUNCS(extattr_set_fd extattr_set_file extattr_set_link)
    1445     ;;
    1446 esac
    14471503
    14481504AC_DISABLE_STATIC
    … …  
    16231679                        ;;
    16241680                *hpux*) AC_DEFINE(HPUX,1,[Whether the host os is HPUX])
    1625                         # Use special PIC flags for the native HP-UX compiler.
    1626                                 BLDSHARED="true"
    1627                                 SHLD="cc"
    1628                                 LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
    1629                                 SONAMEFLAG="-Wl,+h "
    1630                                 PICFLAG="+z"
     1681                        # ia64: 64bit build using gcc with CFLAGS="-mpl64"
     1682                        #       64bit build using HP's cc with CFLAGS="+DD64"
     1683                        # hppa: 64bit build unsupported by gcc
     1684                        #       64bit build using HP's cc with CFLAGS="+DA2.0w"
     1685                        # HP-UX 11.00 ld needs PHSS_33034
     1686                        BLDSHARED="true"
    16311687                        if test "${GCC}" = "yes"; then
    16321688                                PICFLAG="-fPIC"
     1689                                LDSHFLAGS="-shared"
    16331690                        else
    1634                                 PICFLAG="+z +ESnolit"
     1691                                PICFLAG="+z"
     1692                                LDSHFLAGS="-b"
     1693                                # "Uses depth-first symbol resolution"
     1694                                LDSHFLAGS="$LDSHFLAGS -Wl,-B,symbolic,-b"
     1695                                if test "$host_cpu" != "ia64"; then
     1696                                        # "don't store literals in read-only memory" (?):
     1697                                        PICFLAG="$PICFLAG +ESnolit"
     1698                                fi
    16351699                        fi
    16361700                        if test "$host_cpu" = "ia64"; then
    16371701                                SHLIBEXT="so"
    1638                               PICFLAG="+z"
    1639                                 DYNEXP="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
     1702                                # TODO: does the linker find the right 32/64 bit version of the libs? :
     1703                                DYNEXP="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32:/usr/local/lib/hpux64:/usr/lib/hpux64"
    16401704                        else
    16411705                                SHLIBEXT="sl"
    16421706                                DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
     1707                        fi
     1708                        if test "$ac_cv_prog_gnu_ld" = "yes"; then
     1709                                SONAMEFLAG="-Wl,-soname="
     1710                        else
     1711                                SONAMEFLAG="-Wl,+h,"
     1712                        fi
     1713                        # PIE/PIC flags at link time are required on HP-UX because
     1714                        # linking requires a temporary source file, which is being
     1715                        # compiled with the indicated flags - which need to contain
     1716                        # PIC flags when we don't support PIE flags:
     1717                        if test "$PIE_LDFLAGS" = "" ; then
     1718                                PIE_LDFLAGS=\${PICFLAG}
    16431719                        fi
    16441720                        AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
    … …  
    16541730                        AC_DEFINE(STAT_ST_BLOCKSIZE,512)
    16551731                        AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
     1732                        for flags in "-expect_unresolved '*'" "-Wl,-expect_unresolved,'*'" ; do
     1733                                saved_ldflags="$LDFLAGS"
     1734                                AC_MSG_CHECKING([if $flags works])
     1735                                LDFLAGS="$flags $saved_ldflags"
     1736                                AC_TRY_LINK([],[],
     1737                                        [AC_MSG_RESULT([yes])
     1738                                        LDSHFLAGS_Z_NODEFS=$flags],
     1739                                        AC_MSG_RESULT([no]))
     1740                                LDFLAGS="$saved_ldflags"
     1741                                test x"$LDSHFLAGS_Z_NODEFS" != x && break
     1742                        done
    16561743                        ;;
    16571744                *sco*) AC_DEFINE(SCO,1,[Whether the host os is sco unix])
    … …  
    17311818AC_MSG_RESULT($BLDSHARED)
    17321819
    1733 saved_before_as_needed_ldflags="$LDFLAGS"
    1734 for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
     1820if test x"$enable_developer" = x"yes" ; then
     1821        default_as_needed=auto
     1822else
     1823        default_as_needed=no
     1824fi
     1825AC_ARG_ENABLE(as-needed,
     1826        AS_HELP_STRING([--enable-as-needed],
     1827        [Turn on as-needed support if available (default=no)]),
     1828        [enable_as_needed=$enableval],
     1829        [enable_as_needed=$default_as_needed])
     1830if test "x$enable_as_needed" != xno; then
     1831    saved_before_as_needed_ldflags="$LDFLAGS"
     1832    for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
    17351833        saved_ldflags="$LDFLAGS"
    17361834        AC_MSG_CHECKING([if $flags works])
    … …  
    17431841        LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
    17441842        test x"$ld_as_needed_flag_found" = xyes && break
    1745 done
     1843    done
     1844fi
     1845
     1846if test x$ld_as_needed_flag_found = xyes -a x$enable_as_needed = xauto ; then
     1847# check if ld has bug described in https://bugzilla.samba.org/show_bug.cgi?id=7209#c17
     1848        AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG has explicit external libs bug])
     1849cat > conftest_shb.c <<END
     1850void b() {}
     1851END
     1852cat > conftest_sha.c <<END
     1853extern void b();
     1854void a() {
     1855        b();
     1856}
     1857END
     1858cat > conftest.c <<END
     1859extern void a();
     1860int main() {
     1861        a();
     1862        return 0;
     1863}
     1864END
     1865
     1866        rm -fr conftest
     1867        AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_sha.o conftest_sha.c 1>&AS_MESSAGE_LOG_FD 2>&1])
     1868        AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_shb.o conftest_shb.c 1>&AS_MESSAGE_LOG_FD 2>&1])
     1869        TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
     1870        AC_TRY_COMMAND([$TESTCMD -o libconftest_shb.$SHLIBEXT conftest_shb.o 1>&AS_MESSAGE_LOG_FD 2>&1])
     1871        AC_TRY_COMMAND([$TESTCMD -o libconftest_sha.$SHLIBEXT conftest_sha.o 1>&AS_MESSAGE_LOG_FD 2>&1])
     1872        AC_TRY_COMMAND([$CC -o conftest conftest.c $LDFLAGS -L. -lconftest_sha -lconftest_shb 1>&AS_MESSAGE_LOG_FD 2>&1])
     1873        if AC_TRY_COMMAND([eval "$LIB_PATH_VAR=. ./conftest 1>&AS_MESSAGE_LOG_FD 2>&1"])
     1874        then
     1875                AC_MSG_RESULT([no])
     1876        else
     1877                ld_as_needed_flag_found=no
     1878                LDFLAGS="$saved_before_as_needed_ldflags"
     1879                AC_MSG_RESULT([yes])
     1880        fi
     1881        rm conftest* libconftest*
     1882fi
    17461883
    17471884# check if we have to disable LD_AS_NEEDED_FLAG:
    … …  
    18181955   if AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&AS_MESSAGE_LOG_FD])
    18191956   then
    1820      if AC_TRY_COMMAND([`eval echo "$SHLD $LDSHFLAGS $PICFLAG"` -o "shlib.$SHLIBEXT" shlib.o 1>&AS_MESSAGE_LOG_FD])
     1957     TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
     1958     TESTCMD="$TESTCMD -o \"shlib.$SHLIBEXT\" shlib.o"
     1959     if AC_TRY_COMMAND([eval $TESTCMD 1>&AS_MESSAGE_LOG_FD 2>&1])
    18211960     then
    18221961       ac_cv_shlib_works=yes
    … …  
    18381977        PICFLAG="${PIE_CFLAGS}"
    18391978        SHLIBEXT="shared_libraries_disabled"
    1840         merged_build_possible=no
     1979        smbtorture4_possible=no
    18411980fi
    18421981
    … …  
    18461985AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
    18471986
    1848 AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
    18491987
    18501988
    18511989###########################################################
    18521990#
    1853 # Configuration of subsystem / libraries
     1991# Configuration of subsystems / libraries
    18541992#
    18551993###########################################################
    … …  
    19432081#  be extracted from their respective source directories
    19442082#
    1945 AC_ARG_ENABLE(external_libtalloc, [AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc [default=auto]])],
    1946 [ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ])
     2083AC_ARG_ENABLE(external_libtalloc,
     2084        [AS_HELP_STRING([--enable-external-libtalloc],
     2085                [Enable external talloc [default=auto]])],
     2086        [ enable_external_libtalloc=$enableval ],
     2087        [ enable_external_libtalloc=auto ])
    19472088
    19482089if test "x$enable_external_libtalloc" != xno
    … …  
    19502091        PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1,
    19512092                [ enable_external_libtalloc=yes ],
    1952                 [if test x$enable_external_libtalloc = xyes; then
     2093                [ if test x$enable_external_libtalloc = xyes; then
    19532094                        AC_MSG_ERROR([Unable to find libtalloc])
    19542095                  else
    … …  
    19612102then
    19622103        m4_include(../lib/talloc/libtalloc.m4)
    1963         LINK_LIBTALLOC=STATIC
    1964         SMB_LIBRARY(talloc, 2)
     2104        if test x"$USESHARED" == x"no" ; then
     2105                LINK_LIBTALLOC=STATIC
     2106        fi
     2107        LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
     2108        SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
    19652109        LIBTALLOC_OBJ0=""
    19662110        for obj in ${TALLOC_OBJ}; do
    … …  
    19792123        [AS_HELP_STRING([--enable-external-libtdb],
    19802124                [Enable external tdb [default=auto]])],
    1981                 [ enable_external_libtalloc=$enableval ],
    1982                 [ enable_external_libtalloc=auto ])
     2125                [ enable_external_libtdb=$enableval ],
     2126                [ enable_external_libtdb=auto ])
    19832127
    19842128if test "x$enable_external_libtdb" != xno
    19852129then
    1986         PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.1,
     2130        PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.6,
    19872131                [ enable_external_libtdb=yes ],
    19882132                [
    … …  
    19992143then
    20002144        m4_include(../lib/tdb/libtdb.m4)
    2001         LINK_LIBTDB=STATIC
    2002         SMB_LIBRARY(tdb, 1)
     2145        if test x"$USESHARED" == x"no" ; then
     2146                LINK_LIBTDB=STATIC
     2147        fi
     2148        LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
     2149        SMB_LIBRARY(tdb, 1, ${LIBTDBVERSION})
    20032150        LIBTDB_OBJ0=""
     2151        LIBTDB_LIBS="$LIBTDB_LIBS $TDB_DEPS"
    20042152        for obj in ${TDB_OBJ}; do
    20052153                LIBTDB_OBJ0="${LIBTDB_OBJ0} ${tdbdir}/${obj}"
    … …  
    20132161        TDBDUMP="bin/tdbdump\$(EXEEXT)"
    20142162        AC_SUBST(TDBDUMP)
     2163        TDBRESTORE="bin/tdbrestore\$(EXEEXT)"
     2164        AC_SUBST(TDBRESTORE)
    20152165        TDBTOOL="bin/tdbtool\$(EXEEXT)"
    20162166        AC_SUBST(TDBTOOL)
    20172167        TDBTORTURE="bin/tdbtorture\$(EXEEXT)"
    20182168        AC_SUBST(TDBTORTURE)
     2169        ac_cv_have_tdb_err_nesting=yes
     2170else
     2171        AC_TRY_COMPILE([#include <tdb.h>],
     2172                       [enum TDB_ERROR err = TDB_ERR_NESTING],
     2173                       ac_cv_have_tdb_err_nesting=yes,
     2174                       ac_cv_have_tdb_err_nesting=no)
     2175fi
     2176
     2177if test x"$ac_cv_have_tdb_err_nesting" = xyes; then
     2178   AC_DEFINE(HAVE_TDB_ERR_NESTING, 1, [Whether we have TDB_ERR_NESTING])
    20192179fi
    20202180
    … …  
    20222182SMB_LIBRARY(smbclient, 0)
    20232183SMB_LIBRARY(smbsharemodes, 0)
    2024 SMB_LIBRARY(addns, 0, no, [undefined API])
     2184SMB_LIBRARY(addns, 0, [], no, [undefined API])
    20252185
    20262186
    … …  
    22442404fi
    22452405
    2246 AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[
    2247 AC_TRY_LINK([
    2248 #include <sys/time.h>
    2249 #include <unistd.h>], [struct timeval tv; return gettimeofday(&tv, NULL);],
    2250            samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,
    2251            samba_cv_HAVE_GETTIMEOFDAY_TZ=no)])
    2252 if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
    2253     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday takes a tz argument])
    2254 fi
    2255 
    2256 if test x"$samba_cv_WITH_PROFILE" = x"yes"; then
    2257 
    2258     # On some systems (eg. Linux) librt can pull in libpthread. We
    2259     # don't want this to happen because libpthreads changes signal delivery
    2260     # semantics in ways we are not prepared for. This breaks Linux oplocks
    2261     # which rely on signals.
    2262 
    2263     AC_LIBTESTFUNC(rt, clock_gettime,
    2264             [
    2265                             AC_DEFINE(HAVE_CLOCK_GETTIME, 1,
    2266                                 [Whether clock_gettime is available])
    2267                             SMB_CHECK_CLOCK_ID(CLOCK_MONOTONIC)
    2268                             SMB_CHECK_CLOCK_ID(CLOCK_PROCESS_CPUTIME_ID)
    2269                             SMB_CHECK_CLOCK_ID(CLOCK_REALTIME)
    2270                         ])
    2271 
     2406if test x"$libreplace_cv_HAVE_CLOCK_GETTIME_IN_LIBRT" = xyes ; then
     2407        LIBS="$LIBS -lrt"
    22722408fi
    22732409
    … …  
    24252561# end utmp details
    24262562
     2563AC_CACHE_CHECK([for linux fallocate],samba_cv_HAVE_LINUX_FALLOCATE,[
     2564AC_TRY_COMPILE([
     2565#if defined(HAVE_UNISTD_H)
     2566#include <unistd.h>
     2567#endif
     2568#include <sys/types.h>
     2569#define _GNU_SOURCE
     2570#include <fcntl.h>
     2571#if defined(HAVE_LINUX_FALLOC_H)
     2572#include <linux/falloc.h>
     2573#endif],
     2574[int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);],
     2575samba_cv_HAVE_LINUX_FALLOCATE=yes,samba_cv_HAVE_LINUX_FALLOCATE=no)])
     2576if test x"$samba_cv_HAVE_LINUX_FALLOCATE" = x"yes" && test x"$ac_cv_func_fallocate" = x"yes"; then
     2577    AC_DEFINE(HAVE_LINUX_FALLOCATE,1,[Whether the Linux 'fallocate' function is available])
     2578fi
     2579
     2580AC_CACHE_CHECK([for linux fallocate64],samba_cv_HAVE_LINUX_FALLOCATE64,[
     2581AC_TRY_COMPILE([
     2582#if defined(HAVE_UNISTD_H)
     2583#include <unistd.h>
     2584#endif
     2585#include <sys/types.h>
     2586#define _GNU_SOURCE
     2587#include <fcntl.h>
     2588#if defined(HAVE_LINUX_FALLOC_H)
     2589#include <linux/falloc.h>
     2590#endif],
     2591[int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);],
     2592samba_cv_HAVE_LINUX_FALLOCATE64=yes,samba_cv_HAVE_LINUX_FALLOCATE64=no)])
     2593if test x"$samba_cv_HAVE_LINUX_FALLOCATE64" = x"yes" && test x"$ac_cv_func_fallocate64" = x"yes"; then
     2594    AC_DEFINE(HAVE_LINUX_FALLOCATE64,1,[Whether the Linux 'fallocate64' function is available])
     2595fi
    24272596
    24282597ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
    … …  
    26752844        # might not need it.
    26762845        AC_CHECK_LIB(fam, FAMOpen2,
    2677             [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"],
    2678             [samba_cv_HAVE_LIBFAM=no])
     2846            [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam";
     2847            AC_DEFINE(HAVE_FAMOPEN2, 1, Define to 1 if there is support for FAMOpen2)],
     2848            [samba_cv_HAVE_LIBFAM=no])
    26792849
    26802850        if test x"$samba_cv_HAVE_LIBFAM" = x"no" ; then
    26812851            samba_fam_xtra=-lC
    26822852            AC_CHECK_LIB_EXT(fam, samba_fam_xtra, FAMOpen2,
    2683                 [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC"],
    2684                 [samba_cv_HAVE_LIBFAM=no])
     2853                [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC";
     2854                AC_DEFINE(HAVE_FAMOPEN2, 1, Define to 1 if there is support for FAMOpen2)],
     2855                [samba_cv_HAVE_LIBFAM=no])
    26852856            unset samba_fam_xtra
    26862857        fi
    26872858    fi
    2688 
    26892859    if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
    26902860        default_shared_modules="$default_shared_modules vfs_notify_fam"
    … …  
    26942864                        [Whether fam.h contains a typedef for enum FAMCodes]),
    26952865                    [])
     2866    fi
     2867
     2868    if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
     2869        AC_CHECK_LIB(fam, FAMNoExists,
     2870            [AC_DEFINE(HAVE_FAMNOEXISTS, 1, Define to 1 if there is support for FAMNoExists)])
    26962871    fi
    26972872
    … …  
    32403415
    32413416AC_ARG_WITH(ldap,
    3242 [AS_HELP_STRING([--with-ldap], [LDAP support (default yes)])],
     3417[AS_HELP_STRING([--with-ldap], [LDAP support (default=auto)])],
    32433418[ case "$withval" in
    32443419    yes|no)
    … …  
    32533428SMBLDAPUTIL=""
    32543429AC_SUBST(SMBLDAPUTIL)
    3255 LDBLDAP=""
    3256 AC_SUBST(LDBLDAP)
    32573430
    32583431if test x"$with_ldap_support" != x"no"; then
    … …  
    33903563
    33913564AC_ARG_WITH(ads,
    3392 [AS_HELP_STRING([--with-ads], [Active Directory support (default auto)])],
     3565[AS_HELP_STRING([--with-ads], [Active Directory support (default=auto)])],
    33933566[ case "$withval" in
    33943567    yes|no)
    … …  
    36013774    LDFLAGS=$ac_save_LDFLAGS
    36023775  fi
    3603   AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
    3604 [[#ifdef HAVE_KRB5_H
    3605  #include <krb5.h>
    3606  #endif
    3607 ]])
    3608 
    3609   if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
    3610         WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
    3611         if test x"$BLDSHARED" = x"true" ; then
    3612                 EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
    3613         fi
    3614   fi
    36153776
    36163777  # check for new heimdal KRB5_DEPRECATED handling
    … …  
    36403801  # now check for gssapi headers.  This is also done here to allow for
    36413802  # different kerberos include paths
    3642   AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h)
     3803  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h)
    36433804
    36443805  ##################################################################
    … …  
    36653826  if test x"$have_gssapi" != x"yes"; then
    36663827     AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)
     3828     AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS)
    36673829  fi
    36683830
    … …  
    37163878  AC_CHECK_FUNC_EXT(krb5_get_host_realm, $KRB5_LIBS)
    37173879  AC_CHECK_FUNC_EXT(krb5_free_host_realm, $KRB5_LIBS)
     3880  AC_CHECK_FUNC_EXT(gss_get_name_attribute, $KRB5_LIBS)
    37183881
    37193882  # MIT krb5 1.8 does not expose this call (yet)
    … …  
    39234086  fi
    39244087
     4088  found_arcfour_hmac=no
    39254089  AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC_MD5],
    39264090                 samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,[
    … …  
    39404104          x"$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" = x"yes"; then
    39414105    AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,1,
    3942               [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
     4106              [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type definition is available])
     4107    found_arcfour_hmac=yes
     4108  fi
     4109  AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC],
     4110                 samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC,[
     4111    AC_TRY_COMPILE([#include <krb5.h>],
     4112      [krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC;],
     4113      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC=yes,
     4114      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC=no)])
     4115  if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC" = x"yes"; then
     4116    AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC,1,
     4117              [Whether the ENCTYPE_ARCFOUR_HMAC key type definition is available])
     4118    found_arcfour_hmac=yes
    39434119  fi
    39444120
    … …  
    41834359  #
    41844360  #
     4361  if test x"$found_arcfour_hmac" != x"yes"; then
     4362    AC_MSG_WARN(arcfour-hmac-md5 encryption type not found in -lkrb5)
     4363    use_ads=no
     4364  fi
     4365
    41854366  if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
    41864367    AC_MSG_WARN(krb5_mk_req_extended not found in -lkrb5)
    … …  
    42614442
    42624443if test x"$use_ads" != xyes; then
    4263         merged_build_possible=no
     4444        smbtorture4_possible=no
    42644445fi
    42654446
    … …  
    42714452# Compile with DNS Updates support?
    42724453
    4273 with_dnsupdate_support=no
     4454with_dnsupdate_support=auto
    42744455AC_MSG_CHECKING([whether to enable DNS Updates support])
    42754456
    42764457AC_ARG_WITH(dnsupdate,
    4277 [AS_HELP_STRING([--with-dnsupdate], [Enable DNS Updates support (default no)])],
     4458[AS_HELP_STRING([--with-dnsupdate], [Enable DNS Updates support (default=auto)])],
    42784459[ case "$withval" in
    42794460    yes|no)
    … …  
    42874468
    42884469  ################################################################
    4289   # first test for Active Directory support being enabled
    4290   #if test x"$with_ads_support" = x"no"; then
    4291   #             AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
    4292   #             with_dnsupdate_support=no
    4293   #fi           
     4470  # first test for AD / GSSAPI support being enabled
     4471        if test x"$have_gssapi" != xyes ; then
     4472                if test x"$with_dnsupdate_support" = x"yes" ; then
     4473                        AC_MSG_ERROR(DNS Updates support only possible with AD and GSSAPI support)
     4474                else
     4475                        AC_MSG_NOTICE(DNS Updates support only possible with AD and GSSAPI support)
     4476                        with_dnsupdate_support=no
     4477                fi
     4478        fi
    42944479  ##################################################################
    42954480  # then test for uuid.h (necessary to generate unique DNS keynames
    42964481  # (uuid.h is required for this test)
    4297   AC_CHECK_HEADERS(uuid/uuid.h)
    4298 
    4299   if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
    4300         if test x"$with_dnsupdate_support" = x"yes"; then
    4301          AC_MSG_ERROR(uuid.h is needed to enable DNS Updates support)
    4302         else
    4303          AC_MSG_WARN(uuid.h is needed to enable DNS Updates support)
     4482        AC_CHECK_HEADERS(uuid/uuid.h)
     4483
     4484       
     4485        if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
     4486                if test x"$with_dnsupdate_support" = x"yes"; then
     4487                        AC_MSG_ERROR(uuid.h is needed to enable DNS Updates support)
     4488                else
     4489                        AC_MSG_NOTICE(uuid.h is needed to enable DNS Updates support)
     4490                fi
     4491                with_dnsupdate_support=no
    43044492        fi
    4305         with_dnsupdate_support=no
    4306   fi
    43074493fi
    43084494
    … …  
    43364522        ])
    43374523fi
     4524  # finally print out the result:
     4525AC_MSG_CHECKING(whether DNS Updates support is used)
     4526AC_MSG_RESULT([$with_dnsupdate_support])
     4527
    43384528
    43394529#################################################
    … …  
    43554545
    43564546#################################################
    4357 # check for mount- and umount.cifs support
    4358 CIFSMOUNT_PROGS=""
    4359 INSTALL_CIFSMOUNT=""
    4360 UNINSTALL_CIFSMOUNT=""
    4361 AC_MSG_CHECKING(whether to build mount.cifs)
    4362 AC_ARG_WITH(cifsmount,
    4363 [AS_HELP_STRING([--with-cifsmount], [Include mount.cifs (Linux only) support (default=yes)])],
    4364 [ case "$withval" in
    4365   no)
    4366         AC_MSG_RESULT(no)
    4367         ;;
    4368   *)
    4369         case "$host_os" in
    4370         *linux*)
    4371                 AC_MSG_RESULT(yes)
    4372                 AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs])
    4373                 CIFSMOUNT_PROGS="bin/mount.cifs"
    4374                 INSTALL_CIFSMOUNT="installcifsmount"
    4375                 UNINSTALL_CIFSMOUNT="uninstallcifsmount"
    4376                 ;;
    4377         *)
    4378                 AC_MSG_ERROR(not on a linux system!)
    4379                 ;;
    4380         esac
    4381     ;;
    4382   esac ],
    4383 [ case "$host_os" in
    4384   *linux*)
    4385         AC_MSG_RESULT(yes)
    4386         AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs])
    4387         CIFSMOUNT_PROGS="bin/mount.cifs"
    4388         INSTALL_CIFSMOUNT="installcifsmount"
    4389         UNINSTALL_CIFSMOUNT="uninstallcifsmount"
    4390         ;;
    4391   *)
    4392         AC_MSG_RESULT(no)
    4393         ;;
    4394   esac ]
    4395 )
    4396 
    4397 CIFSUMOUNT_PROGS=""
    4398 INSTALL_CIFSUMOUNT=""
    4399 UNINSTALL_CIFSUMOUNT=""
    4400 AC_MSG_CHECKING(whether to build umount.cifs)
    4401 AC_ARG_WITH(cifsumount,
    4402 [AS_HELP_STRING([--with-cifsumount], [Include umount.cifs (Linux only) support (default=no)])],
    4403 [ case "$withval" in
    4404   yes)
    4405         case "$host_os" in
    4406         *linux*)
    4407                 AC_MSG_RESULT(yes)
    4408                 AC_DEFINE(WITH_CIFSUMOUNT,1,[Whether to build umount.cifs])
    4409                 CIFSUMOUNT_PROGS="bin/umount.cifs"
    4410                 INSTALL_CIFSUMOUNT="installcifsumount"
    4411                 UNINSTALL_CIFSUMOUNT="uninstallcifsumount"
    4412                 ;;
    4413         *)
    4414                 AC_MSG_ERROR(not on a linux system!)
    4415                 ;;
    4416         esac
    4417         ;;
    4418   *)
    4419         AC_MSG_RESULT(no)
    4420         ;;
    4421   esac ],
    4422   AC_MSG_RESULT(no)
    4423 )
    4424 
    4425 #################################################
    4426 # check for cifs.upcall support
    4427 AC_CHECK_HEADERS([keyutils.h], [HAVE_KEYUTILS_H=1], [HAVE_KEYUTILS_H=0])
    4428 CIFSUPCALL_PROGS=""
    4429 INSTALL_CIFSUPCALL=""
    4430 UNINSTALL_CIFSUPCALL=""
    4431 AC_MSG_CHECKING(whether to build cifs.upcall)
    4432 AC_ARG_WITH(cifsupcall,
    4433 [AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support (default=yes)])],
    4434 [ case "$withval" in
    4435   no)
    4436         AC_MSG_RESULT(no)
    4437         ;;
    4438   *)
    4439         case "$host_os" in
    4440         *linux*)
    4441                 if test x"$use_ads" != x"yes"; then
    4442                         AC_MSG_ERROR(ADS support should be enabled for building cifs.upcall)
    4443                 elif test x"$HAVE_KEYUTILS_H" != "x1"; then
    4444                         AC_MSG_ERROR(keyutils package is required for cifs.upcall)
    4445                 else
    4446                         AC_MSG_RESULT(yes)
    4447                         AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
    4448                         CIFSUPCALL_PROGS="bin/cifs.upcall"
    4449                         INSTALL_CIFSUPCALL="installcifsupcall"
    4450                         UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
    4451                 fi
    4452                 ;;
    4453         *)
    4454                 AC_MSG_ERROR(not on a linux system!)
    4455                 ;;
    4456         esac
    4457     ;;
    4458   esac ],
    4459 [ case "$host_os" in
    4460   *linux*)
    4461         if test x"$use_ads" != x"yes"; then
    4462                 AC_MSG_WARN(ADS support should be enabled for building cifs.upcall)
    4463         elif test x"$HAVE_KEYUTILS_H" != "x1"; then
    4464                 AC_MSG_WARN(keyutils package is required for cifs.upcall)
    4465         else
    4466                 AC_MSG_RESULT(yes)
    4467                 AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall])
    4468                 CIFSUPCALL_PROGS="bin/cifs.upcall"
    4469                 INSTALL_CIFSUPCALL="installcifsupcall"
    4470                 UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
    4471         fi
    4472         ;;
    4473   *)
    4474         AC_MSG_RESULT(no)
    4475         ;;
    4476   esac ]
    4477 )
    4478 
    4479 
    4480 #################################################
    44814547# Check for a PAM clear-text auth, accounts, password
    44824548# and session support. Most PAM implementations keep their
    … …  
    45624628        AC_MSG_CHECKING(whether to have PAM MODULES support)
    45634629        AC_MSG_RESULT([$create_pam_modules])
     4630
     4631        AC_TRY_COMPILE([
     4632                #if defined(HAVE_SECURITY_PAM_APPL_H)
     4633                #include <security/pam_appl.h>
     4634                #elif defined(HAVE_PAM_PAM_APPL_H)
     4635                #include <pam/pam_appl.h>
     4636                #endif],[
     4637                pam_set_item(0, PAM_RHOST, 0);
     4638                ],
     4639                AC_DEFINE(HAVE_PAM_RHOST, 1,
     4640                          [Define to 1 if PAM_RHOST is available]),[])
     4641
     4642        AC_TRY_COMPILE([
     4643                #if defined(HAVE_SECURITY_PAM_APPL_H)
     4644                #include <security/pam_appl.h>
     4645                #elif defined(HAVE_PAM_PAM_APPL_H)
     4646                #include <pam/pam_appl.h>
     4647                #endif],[
     4648                pam_set_item(0, PAM_TTY, 0);
     4649                ],
     4650                AC_DEFINE(HAVE_PAM_TTY, 1,
     4651                          [Define to 1 if PAM_TTY is available]),[])
     4652
    45644653fi # try_pam != no
    45654654
    … …  
    49785067fi
    49795068
     5069if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
     5070AC_CACHE_CHECK([whether the sys_quota interface works with NFS],samba_cv_SYSQUOTA_WORKS_NFS,[
     5071SAVE_CPPFLAGS="$CPPFLAGS"
     5072CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
     5073AC_TRY_COMPILE([
     5074#include "confdefs.h"
     5075#define NO_PROTO_H 1
     5076#define NO_CONFIG_H 1
     5077#define HAVE_SYS_QUOTAS 1
     5078#define HAVE_NFS_QUOTAS 1
     5079#include "${srcdir-.}/lib/sysquotas_nfs.c"
     5080],[],samba_cv_SYSQUOTA_WORKS_NFS=yes,samba_cv_SYSQUOTA_WORKS_NFS=no)
     5081CPPFLAGS="$SAVE_CPPFLAGS"
     5082])
     5083if test x"$samba_cv_SYSQUOTA_WORKS_NFS" = x"yes"; then
     5084    if test x"$samba_cv_WE_USE_SYS_QUOTAS" = x"yes"; then
     5085        AC_DEFINE(HAVE_NFS_QUOTAS,1,[Whether nfs quota support is available])
     5086    fi
     5087fi
     5088fi
     5089
    49805090if test x"$samba_cv_SYSQUOTA_FOUND" != x"no" -a x"$samba_cv_found_xfs_header" = x"yes"; then
    49815091AC_CACHE_CHECK([whether the sys_quota interface works with XFS],samba_cv_SYSQUOTA_WORKS_XFS,[
    … …  
    53085418AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT])
    53095419
     5420
    53105421#################################################
    53115422# check for cluster extensions
    53125423
    5313 CTDB_CFLAGS=""
    5314 AC_SUBST(CTDB_CFLAGS)
     5424AC_MSG_CHECKING(cluster support)
     5425AC_ARG_WITH(cluster-support,
     5426[AS_HELP_STRING([--with-cluster-support], [Enable cluster extensions (default=auto)])])
     5427
     5428if test x"$with_cluster_support" = x ; then
     5429        with_cluster_support="auto"
     5430fi
     5431
     5432AC_MSG_RESULT($with_cluster_support)
     5433
    53155434AC_ARG_WITH(ctdb,
    53165435[AS_HELP_STRING([--with-ctdb=DIR], [Where to find ctdb sources])],
    … …  
    53245443  esac])
    53255444
     5445AC_ARG_ENABLE(old-ctdb,
     5446        [AS_HELP_STRING([--enable-old-ctdb],
     5447                [Enable build against (too) old ctdb version (default=no)])],,
     5448                [enable_old_ctdb=no])
     5449
     5450
     5451if test "$with_cluster_support" != "no" ; then
     5452
     5453AC_MSG_NOTICE(checking whether cluster support is available)
     5454
     5455have_cluster_support="yes"
     5456ctdb_broken="no"
     5457
    53265458SAVED_CPPFLAGS="$CPPFLAGS"
    53275459CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
    5328 ctdb_broken="missing or broken headers"
    53295460
    53305461AC_CHECK_HEADERS(ctdb.h ctdb_private.h,,,[
    … …  
    53405471])
    53415472
    5342 AC_HAVE_DECL(CTDB_CONTROL_TRANS3_COMMIT,[
    5343 #include "confdefs.h"
    5344 #define NO_CONFIG_H
    5345 #include "replace.h"
    5346 #include "system/wait.h"
    5347 #include "system/network.h"
    5348 #include <talloc.h>
    5349 #include <tdb.h>
    5350 #include <ctdb.h>
    5351 #include <ctdb_private.h>
    5352 ])
    5353 if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
    5354         ctdb_broken=no
    5355 else
    5356         ctdb_broken="ctdb transaction support missing or too old"
    5357 fi
    5358 
    5359 # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
    5360 AC_CHECK_TYPE(struct ctdb_tcp_client,[
    5361         AC_DEFINE([ctdb_control_tcp],[ctdb_tcp_client],[ctdb ipv4 support])
    5362 ],,[
    5363 #include "confdefs.h"
    5364 #define NO_CONFIG_H
    5365 #include "replace.h"
    5366 #include "system/wait.h"
    5367 #include "system/network.h"
    5368 #include <talloc.h>
    5369 #include <tdb.h>
    5370 #include <ctdb.h>
    5371 #include <ctdb_private.h>
    5372 ])
    5373 
    5374 AC_CHECK_TYPE(struct ctdb_control_tcp,[
    5375         AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP],[1],[ctdb ipv4 support])
    5376 ],[
    5377         ctdb_broken="missing struct ctdb_control_tcp"
    5378 ],[
    5379 #include "confdefs.h"
    5380 #define NO_CONFIG_H
    5381 #include "replace.h"
    5382 #include "system/wait.h"
    5383 #include "system/network.h"
    5384 #include <talloc.h>
    5385 #include <tdb.h>
    5386 #include <ctdb.h>
    5387 #include <ctdb_private.h>
    5388 ])
    5389 
    5390 AC_CHECK_TYPE(struct ctdb_control_tcp_addr,[
    5391         AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR],[1],[ctdb ipv6 support])
    5392 ],,[
    5393 #include "confdefs.h"
    5394 #define NO_CONFIG_H
    5395 #include "replace.h"
    5396 #include "system/wait.h"
    5397 #include "system/network.h"
    5398 #include <talloc.h>
    5399 #include <tdb.h>
    5400 #include <ctdb.h>
    5401 #include <ctdb_private.h>
    5402 ])
     5473if test "x$have_cluster_support" = "xyes" -a \
     5474        "x$ac_cv_header_ctdb_h" != "xyes"
     5475then
     5476        have_cluster_support=no
     5477        ctdb_broken="ctdb.h is required for cluster support"
     5478fi
     5479
     5480if test "x$have_cluster_support" = "xyes" -a \
     5481        "x$ac_cv_header_ctdb_h" != "xyes"
     5482then
     5483        have_cluster_support=no
     5484        ctdb_broken="ctdb_private.h is required for cluster support"
     5485fi
     5486
     5487
     5488if test "x$have_cluster_support" = "xyes" ; then
     5489        AC_HAVE_DECL(CTDB_CONTROL_TRANS3_COMMIT,[
     5490        #include "confdefs.h"
     5491        #define NO_CONFIG_H
     5492        #include "replace.h"
     5493        #include "system/wait.h"
     5494        #include "system/network.h"
     5495        #include <talloc.h>
     5496        #include <tdb.h>
     5497        #include <ctdb.h>
     5498        #include <ctdb_private.h>
     5499        ])
     5500        if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" != x"yes"; then
     5501                ctdb_broken="ctdb transaction support missing or too old"
     5502                have_cluster_support=no
     5503        fi
     5504fi
     5505
     5506if test "x$have_cluster_support" = "xyes" ; then
     5507        AC_HAVE_DECL(CTDB_CONTROL_SCHEDULE_FOR_DELETION,[
     5508        #include "confdefs.h"
     5509        #define NO_CONFIG_H
     5510        #include "replace.h"
     5511        #include "system/wait.h"
     5512        #include "system/network.h"
     5513        #include <talloc.h>
     5514        #include <tdb.h>
     5515        #include <ctdb.h>
     5516        #include <ctdb_private.h>
     5517        ])
     5518        if test x"$ac_cv_have_CTDB_CONTROL_SCHEDULE_FOR_DELETION_decl" != x"yes"
     5519        then
     5520                if test "x$enable_old_ctdb" = "xyes" ; then
     5521                        AC_MSG_WARN([ignoring missing SCHEDULE_FOR_DELETION (--enable-old-ctdb)])
     5522                else
     5523                        ctdb_broken="support for SCHEDULE_FOR_DELETION control missing"
     5524                        have_cluster_support=no
     5525                fi
     5526        fi
     5527fi
     5528
     5529if test "x$have_cluster_support" = "xyes" ; then
     5530        # In ctdb 1.0.57, ctdb_control_tcp was temporarily renamed
     5531        # to ctdb_tcp_client.
     5532        AC_CHECK_TYPE(struct ctdb_tcp_client,[
     5533                AC_DEFINE([ctdb_control_tcp],[ctdb_tcp_client],[ctdb ipv4 support])
     5534        ],,[
     5535        #include "confdefs.h"
     5536        #define NO_CONFIG_H
     5537        #include "replace.h"
     5538        #include "system/wait.h"
     5539        #include "system/network.h"
     5540        #include <talloc.h>
     5541        #include <tdb.h>
     5542        #include <ctdb.h>
     5543        #include <ctdb_private.h>
     5544        ])
     5545fi
     5546
     5547if test "x$have_cluster_support" = "xyes" ; then
     5548        AC_CHECK_TYPE(struct ctdb_control_tcp,[
     5549                AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP],[1],[ctdb ipv4 support])
     5550        ],[
     5551                ctdb_broken="missing struct ctdb_control_tcp"
     5552                have_cluster_support=no
     5553        ],[
     5554        #include "confdefs.h"
     5555        #define NO_CONFIG_H
     5556        #include "replace.h"
     5557        #include "system/wait.h"
     5558        #include "system/network.h"
     5559        #include <talloc.h>
     5560        #include <tdb.h>
     5561        #include <ctdb.h>
     5562        #include <ctdb_private.h>
     5563        ])
     5564fi
     5565
     5566# test for optional ipv6 support in ctdb:
     5567if test "x$have_cluster_support" = "xyes" ; then
     5568        AC_CHECK_TYPE(struct ctdb_control_tcp_addr,[
     5569                AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR],[1],[ctdb ipv6 support])
     5570        ],,[
     5571        #include "confdefs.h"
     5572        #define NO_CONFIG_H
     5573        #include "replace.h"
     5574        #include "system/wait.h"
     5575        #include "system/network.h"
     5576        #include <talloc.h>
     5577        #include <tdb.h>
     5578        #include <ctdb.h>
     5579        #include <ctdb_private.h>
     5580        ])
     5581fi
     5582
    54035583CPPFLAGS="$SAVED_CPPFLAGS"
    54045584
    5405 AC_MSG_CHECKING(cluster support)
    5406 AC_ARG_WITH(cluster-support,
    5407 [AS_HELP_STRING([--with-cluster-support], [Enable cluster extensions (default=auto)])])
    5408 
    5409 if test x"$with_cluster_support" = x ; then
    5410         with_cluster_support="auto"
    5411 fi
    5412 
    5413 if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
    5414         if test "x$with_cluster_support" = "xyes"; then
    5415                 AC_MSG_ERROR("ctdb_private.h is required for cluster support")
    5416         fi
    5417         with_cluster_support=no
    5418 fi
    5419 
    5420 if test x"$ctdb_broken" != x"no"; then
    5421         if test "x$with_cluster_support" = "xyes"; then
    5422                 AC_MSG_ERROR(["cluster support: $ctdb_broken"])
    5423         fi
     5585fi # (if test "$with_cluster_support" != "no")
     5586
     5587if test x"$have_cluster_support" = "xno" ; then
     5588        case "$with_cluster_support" in
     5589        yes)
     5590                AC_MSG_ERROR(["cluster support not available: $ctdb_broken"])
     5591                ;;
     5592        auto)
     5593                AC_MSG_WARN(["cluster support not available: $ctdb_broken"])
     5594                ;;
     5595        esac
    54245596        with_cluster_support=no
    54255597fi
    … …  
    54285600    AC_DEFINE(CLUSTER_SUPPORT,1,[Whether to enable cluster extensions])
    54295601    SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CTDB_CPPFLAGS}"
    5430     AC_MSG_RESULT(yes)
     5602    AC_MSG_NOTICE(Building with cluster support)
    54315603else
    5432     AC_MSG_RESULT(no)
    5433 fi
     5604    AC_MSG_NOTICE(Building without cluster support)
     5605fi
     5606
     5607
     5608#################################################
     5609# check for rtnetlink
     5610
     5611AC_CHECK_HEADERS([linux/netlink.h],
     5612  AC_CHECK_HEADERS([linux/rtnetlink.h],[],[],
     5613                   [#include <bits/sockaddr.h>
     5614                    #include <linux/netlink.h>]),
     5615  [],[#include <bits/sockaddr.h>])
    54345616
    54355617#################################################
    … …  
    55465728fi # with_acl_support
    55475729
    5548 
     5730#################################################
     5731# check if we have FreeBSD sunacl
     5732case "$host_os" in
     5733*freebsd*)
     5734    AC_CHECK_HEADER(sunacl.h)
     5735    if test x"$ac_cv_header_sunacl_h" = xyes ; then
     5736       AC_DEFINE(HAVE_FREEBSD_SUNACL_H,1,[Whether we have FreeBSD sunacl around])
     5737       ZFSACL_LIBS=-lsunacl
     5738       AC_SUBST(ZFSACL_LIBS)
     5739       default_shared_modules="$default_shared_modules vfs_zfsacl"
     5740    fi
     5741    ;;
     5742esac
    55495743
    55505744#################################################
    … …  
    55615755        *)
    55625756                AIO_LIBS=$LIBS
     5757                no_rt_LIBS=$LIBS
    55635758                AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"])
     5759                LIBS=$no_rt_LIBS
    55645760                AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"])
    55655761                AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
    … …  
    61866382        LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
    61876383        LIBWBCLIENT_SOVER=0
     6384        LIBWBCLIENT_FULLVER=0
    61886385        if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
    61896386                NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
    … …  
    62126409                UNINSTALL_PAM_MODULES="uninstallpammodules"
    62136410        fi
     6411
     6412        # we use winbind, check for krb5 locate_plugin support:
     6413        AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
     6414                [[#ifdef HAVE_KRB5_H
     6415                 #include <krb5.h>
     6416                 #endif
     6417        ]])
     6418        if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
     6419                WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
     6420                if test x"$BLDSHARED" = x"true" ; then
     6421                        EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
     6422                fi
     6423        fi
     6424        # end of krb5 locate_plugin check
    62146425else
    62156426        AC_MSG_RESULT(no$winbind_no_reason)
    … …  
    62576468if test x"$samba_cv_HAVE_PEERCRED" = x"yes"; then
    62586469    AC_DEFINE(HAVE_PEERCRED,1,[Whether we can use SO_PEERCRED to get socket credentials])
     6470fi
     6471
     6472AC_CACHE_CHECK([for getpeereid],samba_cv_HAVE_GETPEEREID,[
     6473AC_TRY_LINK([#include <sys/types.h>
     6474#include <unistd.h>],
     6475[uid_t uid; gid_t gid; int ret;
     6476 ret = getpeereid(0, &uid, &gid);
     6477],
     6478samba_cv_HAVE_GETPEEREID=yes,samba_cv_HAVE_GETPEEREID=no)])
     6479if test x"$samba_cv_HAVE_GETPEEREID" = xyes; then
     6480   AC_DEFINE(HAVE_GETPEEREID,1,
     6481             [Whether we have getpeereid to get socket credentials])
    62596482fi
    62606483
    … …  
    64366659
    64376660if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
    6438         AC_MSG_ERROR([pthreadpool support cannot be enabled when pthread support was found])
     6661        AC_MSG_ERROR([pthreadpool support cannot be enabled when pthread support was not found])
    64396662fi
    64406663
    … …  
    64436666    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
    64446667    AC_DEFINE(WITH_PTHREADPOOL, 1, [Whether to include pthreadpool helpers])
    6445     AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool.o")
     6668    AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool.o")
     6669    PTHREADPOOLTEST="bin/pthreadpooltest\$(EXEEXT)"
     6670    AC_SUBST(PTHREADPOOLTEST)
    64466671fi
    64476672
    … …  
    64716696    BUILD_INIPARSER='$(INIPARSER_OBJ)'
    64726697        INIPARSERLIBS=""
    6473     FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
     6698    FLAGS1="$FLAGS1 -I\$(srcdir)/../lib/iniparser/src"
    64746699else
    64756700    AC_MSG_RESULT(no)
    … …  
    64816706AC_SUBST(FLAGS1)
    64826707
    6483 
     6708###################################################
     6709# Check for different/missing (set|get|end)netgrent prototypes
     6710CFLAGS_SAVE=$CFLAGS
     6711if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
     6712        CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
     6713fi
     6714AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [
     6715    AC_TRY_COMPILE([#include<netdb.h>
     6716                    #ifdef HAVE_NETGROUP_H
     6717                    #include<netgroup.h>
     6718                    #endif],[setnetgrent("foo")],
     6719                    samba_cv_setnetgrent_prototype=yes, samba_cv_setnetgrent_prototype=no)])
     6720if test x"$samba_cv_setnetgrent_prototype" = x"yes"; then
     6721    AC_DEFINE(HAVE_SETNETGRENT_PROTOTYPE, 1, [If setnetgrent prototype is defined])
     6722fi
     6723AC_CACHE_CHECK([for getnetgrent prototype],samba_cv_getnetgrent_prototype, [
     6724    AC_TRY_COMPILE([#include<netdb.h>
     6725                    #ifdef HAVE_NETGROUP_H
     6726                    #include<netgroup.h>
     6727                    #endif],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
     6728                    samba_cv_getnetgrent_prototype=yes, samba_cv_getnetgrent_prototype=no)])
     6729if test x"$samba_cv_getnetgrent_prototype" = x"yes"; then
     6730    AC_DEFINE(HAVE_GETNETGRENT_PROTOTYPE, 1, [If getnetgrent prototype is defined])
     6731fi
     6732AC_CACHE_CHECK([for endnetgrent prototype],samba_cv_endnetgrent_prototype, [
     6733    AC_TRY_COMPILE([#include<netdb.h>
     6734                    #ifdef HAVE_NETGROUP_H
     6735                    #include<netgroup.h>
     6736                    #endif],[endnetgrent()],
     6737                    samba_cv_endnetgrent_prototype=yes, samba_cv_endnetgrent_prototype=no)])
     6738if test x"$samba_cv_endnetgrent_prototype" = x"yes"; then
     6739    AC_DEFINE(HAVE_ENDNETGRENT_PROTOTYPE, 1, [If endnetgrent prototype is defined])
     6740fi
     6741
     6742CFLAGS=$CFLAGS_SAVE
    64846743
    64856744# Checks for the vfs_fileid module
    … …  
    65626821fi
    65636822
    6564 SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o, "bin/ldapsam.$SHLIBEXT", PDB,
     6823SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o,
     6824                   "bin/ldapsam.$SHLIBEXT", PDB,
    65656825                   [ PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" ] )
    65666826SMB_MODULE(pdb_ads, passdb/pdb_ads.o \$(TLDAP_OBJ), "bin/ads.$SHLIBEXT", PDB)
    … …  
    65706830SMB_SUBSYSTEM(PDB,passdb/pdb_interface.o)
    65716831
    6572 
    6573 SMB_MODULE(rpc_lsarpc, \$(RPC_LSA_OBJ), "bin/librpc_lsarpc.$SHLIBEXT", RPC)
    6574 SMB_MODULE(rpc_winreg, \$(RPC_REG_OBJ), "bin/librpc_winreg.$SHLIBEXT", RPC)
    6575 SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown.$SHLIBEXT", RPC)
    6576 SMB_MODULE(rpc_dssetup, \$(RPC_DSSETUP_OBJ), "bin/librpc_dssetup.$SHLIBEXT", RPC)
    6577 SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC)
    6578 SMB_MODULE(rpc_svcctl, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl.$SHLIBEXT", RPC)
    6579 SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC)
    6580 SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC)
    6581 SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
    6582 SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc.$SHLIBEXT", RPC)
    6583 SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC)
    6584 SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog.$SHLIBEXT", RPC)
    6585 SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
    6586 SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC)
    6587 SMB_SUBSYSTEM(RPC,smbd/server.o)
    6588 
    65896832SMB_MODULE(idmap_ldap, winbindd/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
    65906833SMB_MODULE(idmap_tdb, winbindd/idmap_tdb.o, "bin/tdb.$SHLIBEXT", IDMAP)
    … …  
    65936836SMB_MODULE(idmap_nss, winbindd/idmap_nss.o, "bin/nss.$SHLIBEXT", IDMAP)
    65946837SMB_MODULE(idmap_rid, winbindd/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
     6838SMB_MODULE(idmap_autorid, winbindd/idmap_autorid.o, "bin/autorid.$SHLIBEXT", IDMAP)
    65956839SMB_MODULE(idmap_ad, winbindd/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
    65966840SMB_MODULE(idmap_hash, \$(IDMAP_HASH_OBJ), "bin/hash.$SHLIBEXT", IDMAP)
    … …  
    66476891SMB_MODULE(vfs_commit, \$(VFS_COMMIT_OBJ), "bin/commit.$SHLIBEXT", VFS)
    66486892SMB_MODULE(vfs_gpfs, \$(VFS_GPFS_OBJ), "bin/gpfs.$SHLIBEXT", VFS)
     6893SMB_MODULE(vfs_gpfs_hsm_notify, \$(VFS_GPFS_PREFETCH_OBJ), "bin/gpfs_hsm_notify.$SHLIBEXT", VFS)
    66496894SMB_MODULE(vfs_readahead, \$(VFS_READAHEAD_OBJ), "bin/readahead.$SHLIBEXT", VFS)
    66506895SMB_MODULE(vfs_tsmsm, \$(VFS_TSMSM_OBJ), "bin/tsmsm.$SHLIBEXT", VFS)
    … …  
    66626907SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), "bin/dirsort.$SHLIBEXT", VFS)
    66636908SMB_MODULE(vfs_scannedonly, \$(VFS_SCANNEDONLY_OBJ), "bin/scannedonly.$SHLIBEXT", VFS)
     6909SMB_MODULE(vfs_crossrename, \$(VFS_CROSSRENAME_OBJ), "bin/crossrename.$SHLIBEXT", VFS)
     6910SMB_MODULE(vfs_linux_xfs_sgid, \$(VFS_LINUX_XFS_SGID_OBJ), "bin/linux_xfs_sgid.$SHLIBEXT", VFS)
     6911SMB_MODULE(vfs_time_audit, \$(VFS_TIME_AUDIT_OBJ), "bin/time_audit.$SHLIBEXT", VFS)
    66646912
    66656913SMB_SUBSYSTEM(VFS,smbd/vfs.o)
    … …  
    67667014fi
    67677015
    6768 AC_ARG_ENABLE(merged-build,
    6769 [AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
    6770 [ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
    6771 
    6772 if test x"$enable_merged_build" = x"yes" -a \
    6773         x"$merged_build_possible" = x"no" ; then
    6774         AC_MSG_ERROR(Merged build required but not possible)
    6775 fi
    6776 
    67777016m4_include(../lib/zlib/zlib.m4)
    67787017
    6779 if test x$enable_merged_build = xauto; then
    6780         # Check for python
    6781         m4_include(../m4/check_python.m4)
    6782         AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
    6783 
    6784         AC_MSG_CHECKING([whether it would be possible to do a merged build])
    6785         AC_MSG_RESULT([$merged_build_possible])
    6786 
    6787         # Enable merged build automatically if possible, when in developer mode
    6788         # Don't enable  merged build automatically in 3.4.0.
    6789         #if test "x$developer" = xyes; then
    6790         #       enable_merged_build=$merged_build_possible
    6791         #fi
    6792 fi
    6793 
    6794 if test x$enable_merged_build = xyes; then
    6795         MERGED_BUILD=1
     7018if test x$smbtorture4_possible = xyes; then
    67967019        saved_USESHARED="$USESHARED"
    67977020        USESHARED="false"
    6798         m4_include(samba4.m4)
     7021        smbtorture4_path="bin/smbtorture4"
     7022        smbtorture4_option="-t bin/smbtorture4"
     7023        AC_SUBST(smbtorture4_path)
     7024        AC_SUBST(smbtorture4_option)
    67997025        USESHARED="$saved_USESHARED"
     7026        SMBTORTURE4="bin/smbtorture4"
     7027        AC_SUBST(SMBTORTURE4)
    68007028fi
    68017029
    … …  
    68717099
    68727100CFLAGS="${CFLAGS} \$(FLAGS)"
    6873 
    6874 if test x$MERGED_BUILD != x1; then
    6875         CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
    6876 else
    6877         if test x"$BLDSHARED" = x"true" ; then
    6878                 LDFLAGS="$LDFLAGS -L./bin"
    6879         fi
    6880 fi
    6881 
    6882 AC_SUBST(MAKEFILE)
    6883 if test x$samba_cv_gnu_make = xyes; then
    6884         MAKEFILE=Makefile
    6885 else
    6886         # When we don't have GNU Make, generate a copy of Makefile.in
    6887         # that doesn't have the "include " statements but just includes
    6888         # the files verbatim.
    6889         MAKEFILE=Makefile-noincludes
    6890         $PERL ./script/expand-includes.pl Makefile.in > $MAKEFILE.in
    6891 fi
    6892 AC_OUTPUT($MAKEFILE
     7101CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
     7102
     7103# If we had to expand the includes, make tsure the output file is moved back
     7104AC_OUTPUT_COMMANDS([
     7105if test -f Makefile-noincludes -a ! -f Makefile -a ! -h Makefile ; then
     7106        ln -s Makefile-noincludes Makefile
     7107fi
     7108])
     7109
     7110AC_OUTPUT(Makefile
    68937111          script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
    68947112          lib/netapi/examples/Makefile
    … …  
    69007118          ../examples/libsmbclient/Makefile.internal
    69017119          )
    6902 dnl If we had to expand the includes, make tsure the output file is moved back
    6903 AC_OUTPUT_COMMANDS([
    6904 if test x$MAKEFILE != Makefile; then
    6905         mv $MAKEFILE Makefile
    6906 fi
    6907 ])
    69087120
    69097121#################################################
Note: See TracChangeset for help on using the changeset viewer.