mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
Make samba* work with autoconf-2.67 on 6.x
I'm not entirely sure why it compiles on 7.x/8.x, but nevertheless, the autoconf-specific parts to these patches absolutely need to go upstream.
This commit is contained in:
Ade Lovett
parent
f261a64989
commit
5440e107ef
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=261809
@ -1,8 +1,16 @@
|
||||
--- ./configure.in.orig 2009-01-19 10:40:09.000000000 +0000
|
||||
+++ ./configure.in 2009-01-20 15:50:59.000000000 +0000
|
||||
@@ -1055,6 +1055,21 @@
|
||||
AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
|
||||
fi
|
||||
--- configure.in.orig 2009-09-30 07:21:56.000000000 -0500
|
||||
+++ configure.in 2010-09-24 16:38:20.000000000 -0500
|
||||
@@ -875,3 +875,8 @@
|
||||
AC_CHECK_HEADERS(sys/un.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
|
||||
@@ -1057,2 +1062,17 @@
|
||||
|
||||
+AC_CACHE_CHECK([for struct sigevent type],samba_cv_struct_sigevent, [
|
||||
+ AC_TRY_COMPILE([
|
||||
@ -20,19 +28,11 @@
|
||||
+fi
|
||||
+
|
||||
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
@@ -1258,6 +1273,7 @@
|
||||
|
||||
# Find a method of generating a stack trace
|
||||
@@ -1260,2 +1280,3 @@
|
||||
AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
|
||||
+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
|
||||
AC_CHECK_FUNCS(backtrace_symbols)
|
||||
AC_CHECK_LIB(exc, trace_back_stack)
|
||||
|
||||
@@ -4098,10 +4114,10 @@
|
||||
|
||||
################################################################
|
||||
@@ -4100,6 +4121,6 @@
|
||||
# first test for Active Directory support being enabled
|
||||
- #if test x"$with_ads_support" = x"no"; then
|
||||
- # AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
|
||||
@ -43,58 +43,44 @@
|
||||
+ with_dnsupdate_support=no
|
||||
+ fi
|
||||
##################################################################
|
||||
# then test for uuid.h (necessary to generate unique DNS keynames
|
||||
# (uuid.h is required for this test)
|
||||
@@ -5226,7 +5242,7 @@
|
||||
#################################################
|
||||
# check for ACL support
|
||||
@@ -5228,3 +5249,3 @@
|
||||
|
||||
-AC_MSG_CHECKING(whether to support ACLs)
|
||||
+AC_MSG_NOTICE(checking whether to support ACLs...)
|
||||
AC_ARG_WITH(acl-support,
|
||||
[ --with-acl-support Include ACL support (default=no)],
|
||||
[ case "$withval" in
|
||||
@@ -5234,43 +5250,37 @@
|
||||
|
||||
case "$host_os" in
|
||||
@@ -5236,3 +5257,3 @@
|
||||
*sysv5*)
|
||||
- AC_MSG_RESULT(Using UnixWare ACLs)
|
||||
+ AC_MSG_NOTICE(Using UnixWare ACLs)
|
||||
AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
|
||||
default_static_modules="$default_static_modules vfs_solarisacl"
|
||||
;;
|
||||
@@ -5241,4 +5262,4 @@
|
||||
*solaris*)
|
||||
- AC_MSG_RESULT(Using solaris ACLs)
|
||||
- AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
|
||||
+ AC_MSG_NOTICE(Using Solaris ACLs)
|
||||
+ AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether Solaris ACLs are available])
|
||||
ACL_LIBS="$ACL_LIBS -lsec"
|
||||
default_static_modules="$default_static_modules vfs_solarisacl"
|
||||
;;
|
||||
@@ -5247,3 +5268,3 @@
|
||||
*hpux*)
|
||||
- AC_MSG_RESULT(Using HPUX ACLs)
|
||||
+ AC_MSG_NOTICE(Using HPUX ACLs)
|
||||
AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
|
||||
default_static_modules="$default_static_modules vfs_hpuxacl"
|
||||
;;
|
||||
@@ -5252,3 +5273,3 @@
|
||||
*irix*)
|
||||
- AC_MSG_RESULT(Using IRIX ACLs)
|
||||
+ AC_MSG_NOTICE(Using IRIX ACLs)
|
||||
AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
|
||||
default_static_modules="$default_static_modules vfs_irixacl"
|
||||
;;
|
||||
@@ -5257,3 +5278,3 @@
|
||||
*aix*)
|
||||
- AC_MSG_RESULT(Using AIX ACLs)
|
||||
+ AC_MSG_NOTICE(Using AIX ACLs)
|
||||
AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
|
||||
default_static_modules="$default_static_modules vfs_aixacl"
|
||||
;;
|
||||
@@ -5262,3 +5283,3 @@
|
||||
*osf*)
|
||||
- AC_MSG_RESULT(Using Tru64 ACLs)
|
||||
+ AC_MSG_NOTICE(Using Tru64 ACLs)
|
||||
AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
|
||||
ACL_LIBS="$ACL_LIBS -lpacl"
|
||||
default_static_modules="$default_static_modules vfs_tru64acl"
|
||||
@@ -5267,8 +5288,2 @@
|
||||
;;
|
||||
- *freebsd[[5-9]]*)
|
||||
- AC_MSG_RESULT(Using FreeBSD posix ACLs)
|
||||
@ -103,20 +89,12 @@
|
||||
- default_static_modules="$default_static_modules vfs_posixacl"
|
||||
- ;;
|
||||
*linux*)
|
||||
AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
|
||||
AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
|
||||
@@ -5291,7 +5301,7 @@
|
||||
LIBS=$acl_LIBS
|
||||
])
|
||||
@@ -5293,3 +5308,3 @@
|
||||
if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
|
||||
- AC_MSG_RESULT(Using posix ACLs)
|
||||
+ AC_MSG_NOTICE(Using posix ACLs)
|
||||
AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
|
||||
AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
|
||||
acl_LIBS=$LIBS
|
||||
@@ -5312,12 +5322,18 @@
|
||||
AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
|
||||
fi
|
||||
@@ -5314,8 +5329,14 @@
|
||||
fi
|
||||
- ;;
|
||||
+ ;;
|
||||
@ -135,11 +113,7 @@
|
||||
- LIBS="$LIBS -lacl"
|
||||
+ LIBS="$LIBS $ACL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <sys/acl.h>
|
||||
@@ -5330,20 +5346,20 @@
|
||||
[samba_cv_HAVE_POSIX_ACLS=yes],
|
||||
[samba_cv_HAVE_POSIX_ACLS=no])
|
||||
@@ -5332,5 +5353,5 @@
|
||||
LIBS=$acl_LIBS
|
||||
- ])
|
||||
- if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
|
||||
@ -148,24 +122,17 @@
|
||||
+ if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
|
||||
+ AC_MSG_NOTICE(Using POSIX ACLs)
|
||||
AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
|
||||
AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
|
||||
@@ -5338,3 +5359,3 @@
|
||||
acl_LIBS=$LIBS
|
||||
- LIBS="$LIBS -lacl"
|
||||
+ LIBS="$LIBS $ACL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <sys/acl.h>
|
||||
],[
|
||||
acl_permset_t permset_d;
|
||||
@@ -5345,3 +5366,3 @@
|
||||
acl_perm_t perm;
|
||||
- return acl_get_perm_np( permset_d, perm);
|
||||
+ return acl_get_perm_np(permset_d, perm);
|
||||
],
|
||||
[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
|
||||
[samba_cv_HAVE_ACL_GET_PERM_NP=no])
|
||||
@@ -5352,17 +5368,22 @@
|
||||
if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
|
||||
AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
|
||||
@@ -5354,2 +5375,7 @@
|
||||
fi
|
||||
+ fi
|
||||
+ fi
|
||||
@ -173,43 +140,27 @@
|
||||
+ AC_MSG_NOTICE(No POSIX ACLs support is availble)
|
||||
+ AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -5359,3 +5385,3 @@
|
||||
*)
|
||||
- AC_MSG_RESULT(no)
|
||||
+ AC_MSG_NOTICE(No ACLs support is availble)
|
||||
AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
|
||||
;;
|
||||
@@ -5363,4 +5389,4 @@
|
||||
esac ],
|
||||
+ AC_MSG_NOTICE(No ACLs support is built in)
|
||||
AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
|
||||
- AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
|
||||
@@ -5836,6 +5857,7 @@
|
||||
NSSSONAMEVERSIONSUFFIX=".1"
|
||||
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
|
||||
@@ -5838,2 +5864,3 @@
|
||||
nsswitch/winbind_nss_linux.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="nsswitch/wins_freebsd.o nsswitch/wins.o"
|
||||
WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
|
||||
WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
|
||||
;;
|
||||
@@ -5893,6 +5915,8 @@
|
||||
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
||||
@@ -5895,2 +5922,4 @@
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
||||
+AC_SUBST(WINBIND_WINS_NSS_EXTRA_OBJS)
|
||||
+AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
|
||||
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
|
||||
|
||||
@@ -6195,6 +6219,7 @@
|
||||
SMB_MODULE(vfs_irixacl, \$(VFS_IRIXACL_OBJ), "bin/irixacl.$SHLIBEXT", VFS)
|
||||
SMB_MODULE(vfs_hpuxacl, \$(VFS_HPUXACL_OBJ), "bin/hpuxacl.$SHLIBEXT", VFS)
|
||||
@@ -6197,2 +6226,3 @@
|
||||
SMB_MODULE(vfs_tru64acl, \$(VFS_TRU64ACL_OBJ), "bin/tru64acl.$SHLIBEXT", VFS)
|
||||
+SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
|
||||
SMB_MODULE(vfs_catia, \$(VFS_CATIA_OBJ), "bin/catia.$SHLIBEXT", VFS)
|
||||
SMB_MODULE(vfs_cacheprime, \$(VFS_CACHEPRIME_OBJ), "bin/cacheprime.$SHLIBEXT", VFS)
|
||||
SMB_MODULE(vfs_prealloc, \$(VFS_PREALLOC_OBJ), "bin/prealloc.$SHLIBEXT", VFS)
|
||||
|
||||
@ -81,6 +81,10 @@ OPTIONS= LDAP "With LDAP support" on \
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} < 700000
|
||||
#EXTRA_PATCHES+= ${PATCHDIR}/autoconf267-on-freebsd6.patch
|
||||
.endif
|
||||
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
--- ./configure.in.orig 2009-06-22 21:05:38.000000000 +0000
|
||||
+++ ./configure.in 2009-06-25 23:59:12.000000000 +0000
|
||||
@@ -184,16 +184,6 @@
|
||||
fi
|
||||
fi
|
||||
--- configure.in.orig 2009-09-30 07:24:50.000000000 -0500
|
||||
+++ configure.in 2010-09-24 16:40:51.000000000 -0500
|
||||
@@ -186,12 +186,2 @@
|
||||
|
||||
-AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
-
|
||||
@ -15,11 +13,17 @@
|
||||
-fi
|
||||
-
|
||||
#################################################
|
||||
# check for a shared memory profiling support
|
||||
AC_MSG_CHECKING(whether to use profiling)
|
||||
@@ -888,6 +878,21 @@
|
||||
[#include <signal.h>])
|
||||
fi
|
||||
@@ -663,3 +653,8 @@
|
||||
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
|
||||
@@ -890,2 +885,17 @@
|
||||
|
||||
+AC_CACHE_CHECK([for struct sigevent type],samba_cv_struct_sigevent, [
|
||||
+ AC_TRY_COMPILE([
|
||||
@ -37,21 +41,13 @@
|
||||
+fi
|
||||
+
|
||||
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
@@ -1976,9 +1981,6 @@
|
||||
AC_MSG_CHECKING([PICFLAG])
|
||||
AC_MSG_RESULT([$PICFLAG])
|
||||
@@ -1978,5 +1988,2 @@
|
||||
|
||||
-AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
-AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
|
||||
-
|
||||
AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
[ac_cv_shlib_works],[
|
||||
# try building a trivial shared library
|
||||
@@ -2417,31 +2419,15 @@
|
||||
|
||||
# This is here to handle -withval stuff for --with-libiconv
|
||||
@@ -2419,27 +2426,11 @@
|
||||
# Perhaps we should always add a -L
|
||||
+ LDFLAGS="$save_LDFLAGS -L$i/lib"
|
||||
CPPFLAGS="$save_CPPFLAGS -I$i/include"
|
||||
@ -85,19 +81,11 @@
|
||||
- iconv_current_LDFLAGS="-L$i/$libext"
|
||||
+ iconv_current_LDFLAGS="-L$i/lib"
|
||||
iconv_current_CPPFLAGS="-I$i/include"
|
||||
|
||||
if test x"$jm_cv_lib_iconv" != x; then
|
||||
@@ -2450,7 +2436,6 @@
|
||||
# We found iconv in libc.
|
||||
iconv_current_LIBS=""
|
||||
@@ -2452,3 +2443,2 @@
|
||||
fi
|
||||
-
|
||||
fi
|
||||
|
||||
if test x"$ICONV_FOUND" = "xyes" ; then
|
||||
@@ -4148,10 +4133,10 @@
|
||||
|
||||
################################################################
|
||||
@@ -4150,6 +4140,6 @@
|
||||
# first test for Active Directory support being enabled
|
||||
- #if test x"$with_ads_support" = x"no"; then
|
||||
- # AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
|
||||
@ -108,25 +96,15 @@
|
||||
+ with_dnsupdate_support=no
|
||||
+ fi
|
||||
##################################################################
|
||||
# then test for uuid.h (necessary to generate unique DNS keynames
|
||||
# (uuid.h is required for this test)
|
||||
@@ -5791,6 +5776,7 @@
|
||||
NSSSONAMEVERSIONSUFFIX=".1"
|
||||
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
|
||||
@@ -5793,2 +5783,3 @@
|
||||
nsswitch/winbind_nss_linux.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="nsswitch/wins_freebsd.o"
|
||||
WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
|
||||
WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
|
||||
;;
|
||||
@@ -5869,23 +5855,15 @@
|
||||
fi
|
||||
|
||||
@@ -5871,3 +5862,2 @@
|
||||
# Display test results
|
||||
-
|
||||
if test x"$HAVE_WINBIND" = x"no"; then
|
||||
WINBIND_NSS=""
|
||||
WINBIND_WINS_NSS=""
|
||||
fi
|
||||
@@ -5877,8 +5867,2 @@
|
||||
|
||||
-if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
|
||||
- BUILD_LIBWBCLIENT_SHARED=no
|
||||
@ -135,29 +113,22 @@
|
||||
-fi
|
||||
-
|
||||
LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
|
||||
LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
|
||||
LIBWBCLIENT_SOVER=0
|
||||
@@ -5887,3 +5871,2 @@
|
||||
if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
|
||||
- NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
## Only worry about libwbclient if we have shared library support
|
||||
## and winbindd
|
||||
LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
|
||||
@@ -5903,26 +5881,34 @@
|
||||
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
@@ -5905,3 +5888,5 @@
|
||||
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
|
||||
- if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
|
||||
+ if test $BLDSHARED = true; then
|
||||
+ NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
+ if test x"$create_pam_modules" = x"yes"; then
|
||||
PAM_MODULES="$PAM_MODULES pam_winbind"
|
||||
INSTALL_PAM_MODULES="installpammodules"
|
||||
@@ -5909,2 +5894,3 @@
|
||||
UNINSTALL_PAM_MODULES="uninstallpammodules"
|
||||
+ fi
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no$winbind_no_reason)
|
||||
fi
|
||||
@@ -5914,3 +5900,6 @@
|
||||
|
||||
-AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
|
||||
+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
@ -165,12 +136,11 @@
|
||||
+
|
||||
+AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-pthread"
|
||||
AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
|
||||
|
||||
AC_SUBST(WINBIND_NSS_PTHREAD)
|
||||
@@ -5919,3 +5908,2 @@
|
||||
AC_SUBST(WINBIND_NSS)
|
||||
-AC_SUBST(WINBIND_WINS_NSS)
|
||||
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
||||
@@ -5923,4 +5911,7 @@
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
||||
-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
|
||||
@ -179,18 +149,15 @@
|
||||
+AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
|
||||
+AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
|
||||
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
||||
@@ -6076,2 +6067,7 @@
|
||||
AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
|
||||
@@ -6073,13 +6059,21 @@
|
||||
# Start
|
||||
AC_CHECK_FUNC(getmntent)
|
||||
|
||||
-AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
|
||||
|
||||
AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
|
||||
AC_CACHE_VAL(vfsfileid_cv_statfs,[
|
||||
AC_TRY_RUN([
|
||||
@@ -6081,3 +6077,11 @@
|
||||
#include <sys/types.h>
|
||||
+ #ifdef HAVE_SYS_PARAM_H
|
||||
+ #include <sys/param.h>
|
||||
@ -202,11 +169,7 @@
|
||||
#include <sys/statfs.h>
|
||||
+ #endif
|
||||
int main(void)
|
||||
{
|
||||
struct statfs fsd;
|
||||
@@ -6325,6 +6319,16 @@
|
||||
|
||||
fi
|
||||
@@ -6327,2 +6331,12 @@
|
||||
|
||||
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
+
|
||||
@ -219,5 +182,3 @@
|
||||
+fi
|
||||
+
|
||||
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
|
||||
LIB_REMOVE_USR_LIB(LDFLAGS)
|
||||
LIB_REMOVE_USR_LIB(LIBS)
|
||||
|
||||
12
net/samba32/files/patch-lib__replace__libreplace.m4
Normal file
12
net/samba32/files/patch-lib__replace__libreplace.m4
Normal file
@ -0,0 +1,12 @@
|
||||
--- lib/replace/libreplace.m4.orig 2009-09-30 07:24:50.000000000 -0500
|
||||
+++ lib/replace/libreplace.m4 2010-09-24 16:55:12.000000000 -0500
|
||||
@@ -98,3 +98,8 @@
|
||||
AC_CHECK_HEADERS(stdarg.h vararg.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h mntent.h)
|
||||
+AC_CHECK_HEADERS([sys/param.h sys/mount.h], [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(mntent.h)
|
||||
AC_CHECK_HEADERS(stropts.h)
|
||||
@ -1,8 +1,6 @@
|
||||
--- ./configure.in.orig 2010-01-14 10:12:10.000000000 +0000
|
||||
+++ ./configure.in 2010-02-05 00:27:01.000000000 +0000
|
||||
@@ -189,16 +189,6 @@
|
||||
fi
|
||||
fi
|
||||
--- configure.in.orig 2010-06-11 06:22:12.000000000 -0500
|
||||
+++ configure.in 2010-09-24 16:42:02.000000000 -0500
|
||||
@@ -191,12 +191,2 @@
|
||||
|
||||
-AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
-
|
||||
@ -15,21 +13,23 @@
|
||||
-fi
|
||||
-
|
||||
#################################################
|
||||
# check for a shared memory profiling support
|
||||
AC_MSG_CHECKING(whether to use profiling)
|
||||
@@ -1976,9 +1966,6 @@
|
||||
AC_MSG_CHECKING([PICFLAG])
|
||||
AC_MSG_RESULT([$PICFLAG])
|
||||
@@ -668,3 +658,8 @@
|
||||
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
|
||||
@@ -1978,5 +1973,2 @@
|
||||
|
||||
-AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
-AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
|
||||
-
|
||||
AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
[ac_cv_shlib_works],[
|
||||
# try building a trivial shared library
|
||||
@@ -4180,10 +4167,10 @@
|
||||
|
||||
################################################################
|
||||
@@ -4182,6 +4174,6 @@
|
||||
# first test for Active Directory support being enabled
|
||||
- #if test x"$with_ads_support" = x"no"; then
|
||||
- # AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
|
||||
@ -40,11 +40,7 @@
|
||||
+ with_dnsupdate_support=no
|
||||
+ fi
|
||||
##################################################################
|
||||
# then test for uuid.h (necessary to generate unique DNS keynames
|
||||
# (uuid.h is required for this test)
|
||||
@@ -4400,15 +4387,51 @@
|
||||
x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
|
||||
if test x"${try_pam}" = x"yes";then
|
||||
@@ -4402,11 +4394,47 @@
|
||||
AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
|
||||
- fi
|
||||
+ fi
|
||||
@ -96,34 +92,20 @@
|
||||
+ ]
|
||||
+ )
|
||||
|
||||
if test x"$create_pam_modules" = x"yes"; then
|
||||
AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
|
||||
@@ -4418,7 +4441,7 @@
|
||||
AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
|
||||
AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
|
||||
@@ -4420,3 +4448,3 @@
|
||||
else
|
||||
- AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
|
||||
+ AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
|
||||
fi
|
||||
fi
|
||||
AC_MSG_CHECKING(whether to use PAM support)
|
||||
@@ -5973,6 +5996,7 @@
|
||||
NSSSONAMEVERSIONSUFFIX=".1"
|
||||
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
|
||||
@@ -5975,2 +6003,3 @@
|
||||
nsswitch/winbind_nss_linux.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="nsswitch/wins_freebsd.o"
|
||||
WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
|
||||
WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
|
||||
;;
|
||||
@@ -6051,23 +6075,15 @@
|
||||
fi
|
||||
|
||||
@@ -6053,3 +6082,2 @@
|
||||
# Display test results
|
||||
-
|
||||
if test x"$HAVE_WINBIND" = x"no"; then
|
||||
WINBIND_NSS=""
|
||||
WINBIND_WINS_NSS=""
|
||||
fi
|
||||
@@ -6059,8 +6087,2 @@
|
||||
|
||||
-if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
|
||||
- BUILD_LIBWBCLIENT_SHARED=no
|
||||
@ -132,29 +114,22 @@
|
||||
-fi
|
||||
-
|
||||
LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
|
||||
LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
|
||||
LIBWBCLIENT_SOVER=0
|
||||
@@ -6069,3 +6091,2 @@
|
||||
if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
|
||||
- NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
## Only worry about libwbclient if we have shared library support
|
||||
## and winbindd
|
||||
LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
|
||||
@@ -6085,26 +6101,34 @@
|
||||
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
@@ -6087,3 +6108,5 @@
|
||||
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
|
||||
- if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
|
||||
+ if test $BLDSHARED = true; then
|
||||
+ NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
+ if test x"$create_pam_modules" = x"yes"; then
|
||||
PAM_MODULES="$PAM_MODULES pam_winbind"
|
||||
INSTALL_PAM_MODULES="installpammodules"
|
||||
@@ -6091,2 +6114,3 @@
|
||||
UNINSTALL_PAM_MODULES="uninstallpammodules"
|
||||
+ fi
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no$winbind_no_reason)
|
||||
fi
|
||||
@@ -6096,3 +6120,6 @@
|
||||
|
||||
-AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
|
||||
+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
@ -162,12 +137,11 @@
|
||||
+
|
||||
+AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="${PTHREAD_LIBS}"
|
||||
AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
|
||||
|
||||
AC_SUBST(WINBIND_NSS_PTHREAD)
|
||||
@@ -6101,3 +6128,2 @@
|
||||
AC_SUBST(WINBIND_NSS)
|
||||
-AC_SUBST(WINBIND_WINS_NSS)
|
||||
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
||||
@@ -6105,4 +6131,7 @@
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
||||
-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
|
||||
@ -176,18 +150,15 @@
|
||||
+AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
|
||||
+AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
|
||||
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
||||
@@ -6294,2 +6323,7 @@
|
||||
AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
|
||||
@@ -6291,13 +6315,21 @@
|
||||
# Start
|
||||
AC_CHECK_FUNC(getmntent)
|
||||
|
||||
-AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
|
||||
|
||||
AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
|
||||
AC_CACHE_VAL(vfsfileid_cv_statfs,[
|
||||
AC_TRY_RUN([
|
||||
@@ -6299,3 +6333,11 @@
|
||||
#include <sys/types.h>
|
||||
+ #ifdef HAVE_SYS_PARAM_H
|
||||
+ #include <sys/param.h>
|
||||
@ -199,11 +170,7 @@
|
||||
#include <sys/statfs.h>
|
||||
+ #endif
|
||||
int main(void)
|
||||
{
|
||||
struct statfs fsd;
|
||||
@@ -6554,6 +6586,16 @@
|
||||
|
||||
fi
|
||||
@@ -6556,2 +6598,12 @@
|
||||
|
||||
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
+
|
||||
@ -216,14 +183,8 @@
|
||||
+fi
|
||||
+
|
||||
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
|
||||
LIB_REMOVE_USR_LIB(LDFLAGS)
|
||||
LIB_REMOVE_USR_LIB(LIBS)
|
||||
@@ -6610,6 +6652,8 @@
|
||||
pkgconfig/wbclient.pc
|
||||
pkgconfig/netapi.pc
|
||||
@@ -6612,2 +6664,4 @@
|
||||
pkgconfig/smbsharemodes.pc
|
||||
+ lib/talloc/talloc.pc
|
||||
+ lib/tdb/tdb.pc
|
||||
../examples/libsmbclient/Makefile.internal
|
||||
)
|
||||
|
||||
|
||||
12
net/samba33/files/patch-lib__replace__libreplace.m4
Normal file
12
net/samba33/files/patch-lib__replace__libreplace.m4
Normal file
@ -0,0 +1,12 @@
|
||||
--- lib/replace/libreplace.m4.orig 2010-06-11 06:22:12.000000000 -0500
|
||||
+++ lib/replace/libreplace.m4 2010-09-24 17:11:04.000000000 -0500
|
||||
@@ -98,3 +98,8 @@
|
||||
AC_CHECK_HEADERS(stdarg.h vararg.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h mntent.h)
|
||||
+AC_CHECK_HEADERS([sys/param.h sys/mount.h], [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(mntent.h)
|
||||
AC_CHECK_HEADERS(stropts.h)
|
||||
12
net/samba34/files/patch-lib__replace__libreplace.m4
Normal file
12
net/samba34/files/patch-lib__replace__libreplace.m4
Normal file
@ -0,0 +1,12 @@
|
||||
--- ./lib/replace/libreplace.m4.orig 2010-05-10 07:58:53.000000000 -0500
|
||||
+++ ./lib/replace/libreplace.m4 2010-09-24 17:13:45.000000000 -0500
|
||||
@@ -103,3 +103,8 @@
|
||||
AC_CHECK_HEADERS(stdarg.h vararg.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h mntent.h)
|
||||
+AC_CHECK_HEADERS([sys/param.h sys/mount.h], [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(mntent.h)
|
||||
AC_CHECK_HEADERS(stropts.h)
|
||||
@ -1,8 +1,6 @@
|
||||
--- ./source3/configure.in.orig 2010-05-10 14:58:53.000000000 +0200
|
||||
+++ ./source3/configure.in 2010-06-10 17:50:46.000000000 +0200
|
||||
@@ -210,16 +210,6 @@
|
||||
fi
|
||||
fi
|
||||
--- ./source3/configure.in.orig 2010-05-10 07:58:53.000000000 -0500
|
||||
+++ ./source3/configure.in 2010-09-24 16:43:52.000000000 -0500
|
||||
@@ -212,12 +212,2 @@
|
||||
|
||||
-AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
-
|
||||
@ -15,11 +13,17 @@
|
||||
-fi
|
||||
-
|
||||
#################################################
|
||||
# check for a shared memory profiling support
|
||||
AC_MSG_CHECKING(whether to use profiling)
|
||||
@@ -781,10 +771,10 @@
|
||||
|
||||
if test "x$CUPS_CONFIG" != x; then
|
||||
@@ -699,3 +689,8 @@
|
||||
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
|
||||
-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
+AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
|
||||
@@ -783,6 +778,6 @@
|
||||
|
||||
- ac_save_CFLAGS=$CFLAGS
|
||||
- ac_save_LDFLAGS=$LDFLAGS
|
||||
@ -29,32 +33,20 @@
|
||||
- CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
|
||||
+ CPPFLAGS="$CPPFLAGS `$CUPS_CONFIG --cflags`"
|
||||
LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
|
||||
PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
|
||||
AC_CHECK_HEADERS(cups/cups.h cups/language.h)
|
||||
@@ -794,8 +784,8 @@
|
||||
samba_cv_HAVE_CUPS=yes
|
||||
else
|
||||
@@ -796,4 +791,4 @@
|
||||
AC_MSG_WARN([cups-config around but cups-devel not installed])
|
||||
- CFLAGS=$ac_save_CFLAGS
|
||||
- LDFLAGS=$ac_save_LDFLAGS
|
||||
+ CPPFLAGS=$ac_save_PRINT_CPPFLAGS
|
||||
+ LDFLAGS=$ac_save_PRINT_LDFLAGS
|
||||
PRINT_LIBS=$ac_save_PRINT_LIBS
|
||||
fi
|
||||
|
||||
@@ -1749,9 +1739,6 @@
|
||||
AC_MSG_CHECKING([PICFLAG])
|
||||
AC_MSG_RESULT([$PICFLAG])
|
||||
@@ -1751,5 +1746,2 @@
|
||||
|
||||
-AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
-AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
|
||||
-
|
||||
AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
[ac_cv_shlib_works],[
|
||||
# try building a trivial shared library
|
||||
@@ -3961,10 +3948,10 @@
|
||||
|
||||
################################################################
|
||||
@@ -3963,6 +3955,6 @@
|
||||
# first test for Active Directory support being enabled
|
||||
- #if test x"$with_ads_support" = x"no"; then
|
||||
- # AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
|
||||
@ -65,11 +57,7 @@
|
||||
+ with_dnsupdate_support=no
|
||||
+ fi
|
||||
##################################################################
|
||||
# then test for uuid.h (necessary to generate unique DNS keynames
|
||||
# (uuid.h is required for this test)
|
||||
@@ -4181,15 +4168,51 @@
|
||||
x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
|
||||
if test x"${try_pam}" = x"yes";then
|
||||
@@ -4183,11 +4175,47 @@
|
||||
AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
|
||||
- fi
|
||||
+ fi
|
||||
@ -121,38 +109,22 @@
|
||||
+ ]
|
||||
+ )
|
||||
|
||||
if test x"$create_pam_modules" = x"yes"; then
|
||||
AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
|
||||
@@ -4199,7 +4222,7 @@
|
||||
AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
|
||||
AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
|
||||
@@ -4201,3 +4229,3 @@
|
||||
else
|
||||
- AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
|
||||
+ AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
|
||||
fi
|
||||
fi
|
||||
AC_MSG_CHECKING(whether to use PAM support)
|
||||
@@ -5254,7 +5277,8 @@
|
||||
esac
|
||||
fi # with_acl_support
|
||||
@@ -5256,3 +5284,4 @@
|
||||
|
||||
-
|
||||
+# check for NFSv4 acl
|
||||
+AC_CHECK_LIB(sunacl, acl, [ACL_LIBS="$ACL_LIBS -lsunacl"])
|
||||
|
||||
#################################################
|
||||
# check for AIO support
|
||||
@@ -5796,6 +5820,7 @@
|
||||
NSSSONAMEVERSIONSUFFIX=".1"
|
||||
WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
|
||||
@@ -5798,2 +5827,3 @@
|
||||
../nsswitch/winbind_nss_linux.o"
|
||||
+ WINBIND_WINS_NSS_EXTRA_OBJS="../nsswitch/wins_freebsd.o"
|
||||
WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
|
||||
WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
|
||||
;;
|
||||
@@ -5888,17 +5913,10 @@
|
||||
AC_DEFINE(WITH_WINBIND,1,[Whether to link to wbclient])
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
@@ -5890,8 +5920,2 @@
|
||||
else
|
||||
- if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
|
||||
- BUILD_LIBWBCLIENT_SHARED=no
|
||||
@ -161,29 +133,22 @@
|
||||
- fi
|
||||
-
|
||||
LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
|
||||
LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
|
||||
LIBWBCLIENT_SOVER=0
|
||||
@@ -5900,3 +5924,2 @@
|
||||
if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
|
||||
- NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
## Only worry about libwbclient if we have shared
|
||||
# library support
|
||||
LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
|
||||
@@ -5920,26 +5938,34 @@
|
||||
|
||||
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
|
||||
@@ -5922,3 +5945,5 @@
|
||||
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
|
||||
- if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
|
||||
+ if test $BLDSHARED = true; then
|
||||
+ NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
|
||||
+ if test x"$create_pam_modules" = x"yes"; then
|
||||
PAM_MODULES="$PAM_MODULES pam_winbind"
|
||||
INSTALL_PAM_MODULES="installpammodules"
|
||||
@@ -5926,2 +5951,3 @@
|
||||
UNINSTALL_PAM_MODULES="uninstallpammodules"
|
||||
+ fi
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no$winbind_no_reason)
|
||||
fi
|
||||
@@ -5931,3 +5957,6 @@
|
||||
|
||||
-AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
|
||||
+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
|
||||
@ -191,12 +156,11 @@
|
||||
+
|
||||
+AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="${PTHREAD_LIBS}"
|
||||
AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
|
||||
|
||||
AC_SUBST(WINBIND_NSS_PTHREAD)
|
||||
@@ -5936,3 +5965,2 @@
|
||||
AC_SUBST(WINBIND_NSS)
|
||||
-AC_SUBST(WINBIND_WINS_NSS)
|
||||
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
||||
@@ -5940,4 +5968,7 @@
|
||||
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
||||
-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
|
||||
@ -205,18 +169,15 @@
|
||||
+AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
|
||||
+AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||
|
||||
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
||||
@@ -6134,2 +6165,7 @@
|
||||
AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/mount.h, [], [],
|
||||
+[[#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+]])
|
||||
|
||||
@@ -6131,13 +6157,21 @@
|
||||
# Start
|
||||
AC_CHECK_FUNC(getmntent)
|
||||
|
||||
-AC_CHECK_HEADERS(sys/statfs.h)
|
||||
+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
|
||||
|
||||
AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
|
||||
AC_CACHE_VAL(vfsfileid_cv_statfs,[
|
||||
AC_TRY_RUN([
|
||||
@@ -6139,3 +6175,11 @@
|
||||
#include <sys/types.h>
|
||||
+ #ifdef HAVE_SYS_PARAM_H
|
||||
+ #include <sys/param.h>
|
||||
@ -228,11 +189,7 @@
|
||||
#include <sys/statfs.h>
|
||||
+ #endif
|
||||
int main(void)
|
||||
{
|
||||
struct statfs fsd;
|
||||
@@ -6449,6 +6483,26 @@
|
||||
CFLAGS="-I../lib/zlib $CFLAGS"
|
||||
])
|
||||
@@ -6451,2 +6495,22 @@
|
||||
|
||||
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
|
||||
+
|
||||
@ -255,5 +212,3 @@
|
||||
+fi
|
||||
+
|
||||
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
|
||||
LIB_REMOVE_USR_LIB(LDFLAGS)
|
||||
LIB_REMOVE_USR_LIB(LIBS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user