summaryrefslogtreecommitdiff
path: root/net/samba3/files/patch-configure.in
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2006-07-12 00:16:32 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2006-07-12 00:16:32 +0000
commit16b56ac16cabedd75caae5f2f7906cb63544e472 (patch)
tree524182c9ba98eb8d1327f47095ea38de500464db /net/samba3/files/patch-configure.in
parent- Update to 1.5 (diff)
- Upgrade to 3.0.23 (including security fix).
o Improved 'make test' o New offline mode in winbindd. o New Kerberos support for pam_winbind.so. o New handling of unmapped users and groups. o New non-root share management tools. o Improved support for local and BUILTIN groups. o Winbind IDMAP integration with RFC2307 schema objects supported by Windows 2003 R2. o Rewritten 'net ads join' to mimic Windows XP without requiring administrative rights to join a domain. PR: ports/100100 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=167548
Diffstat (limited to 'net/samba3/files/patch-configure.in')
-rw-r--r--net/samba3/files/patch-configure.in68
1 files changed, 60 insertions, 8 deletions
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index cfd1e4745069..a91fb732872e 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig Mon Feb 20 21:33:23 2006
-+++ configure.in Sat Feb 25 05:34:56 2006
-@@ -968,6 +968,21 @@
+--- configure.in.orig Fri Jun 23 15:16:53 2006
++++ configure.in Tue Jun 27 01:17:29 2006
+@@ -242,7 +242,6 @@
+ AC_SUBST(SHELL)
+ AC_SUBST(LDSHFLAGS)
+ AC_SUBST(SONAMEFLAG)
+-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+ AC_SUBST(SHLD)
+ AC_SUBST(HOST_OS)
+ AC_SUBST(PICFLAGS)
+@@ -1089,6 +1088,21 @@
AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
fi
@@ -22,25 +30,69 @@
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
AC_TRY_COMPILE([
#include <sys/types.h>
-@@ -1408,7 +1423,6 @@
+@@ -1639,7 +1653,6 @@
+ HOST_OS="$host_os"
+ LDSHFLAGS="-shared"
+ SONAMEFLAG="#"
+-NSSSONAMEVERSIONSUFFIX=""
+ SHLD="\${CC} \${CFLAGS}"
+ PICFLAGS=""
+ PICSUFFIX="po"
+@@ -1664,7 +1677,6 @@
DYNEXP="-Wl,--export-dynamic"
PICFLAGS="-fPIC"
SONAMEFLAG="-Wl,-soname="
-- SONAMEVERSIONSUFFIX=".2"
+- NSSSONAMEVERSIONSUFFIX=".2"
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;
*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
-@@ -4911,11 +4925,13 @@
+@@ -1674,7 +1686,6 @@
+ if test "${GCC}" = "yes"; then
+ PICFLAGS="-fPIC"
+ SONAMEFLAG="-Wl,-soname="
+- NSSSONAMEVERSIONSUFFIX=".1"
+ if test "${ac_cv_prog_gnu_ld}" = "yes"; then
+ DYNEXP="-Wl,-E"
+ fi
+@@ -4868,6 +4879,7 @@
+ AC_MSG_RESULT(yes)
+ case "$host_os" in
+ *)
++ AIO_LIBS=$LIBS
+ AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"])
+ AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"])
+ AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
+@@ -5268,14 +5280,17 @@
+ WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT"
+ WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT"
+ WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
++NSSSONAMEVERSIONSUFFIX=""
case "$host_os" in
*linux*)
-+ SONAMEVERSIONSUFFIX=".2"
++ NSSSONAMEVERSIONSUFFIX=".2"
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
*freebsd[[5-9]]*)
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
-+ SONAMEVERSIONSUFFIX=".1"
++ NSSSONAMEVERSIONSUFFIX=".1"
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
nsswitch/winbind_nss_linux.o"
WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
+@@ -5290,6 +5305,7 @@
+ *solaris*)
+ # Solaris winbind client is implemented as a wrapper around
+ # the Linux version.
++ NSSSONAMEVERSIONSUFFIX=".1"
+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \
+ nsswitch/winbind_nss_linux.o"
+ WINBIND_NSS_EXTRA_LIBS="-lsocket"
+@@ -5316,6 +5332,7 @@
+ AC_SUBST(WINBIND_NSS_LDSHFLAGS)
+ AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
+ AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
++AC_SUBST(NSSSONAMEVERSIONSUFFIX)
+
+ # Check the setting of --with-winbind
+