diff options
Diffstat (limited to 'net/samba/patches/patch-au')
| -rw-r--r-- | net/samba/patches/patch-au | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au index a5c9d7d2449..204fbd360a4 100644 --- a/net/samba/patches/patch-au +++ b/net/samba/patches/patch-au @@ -1,8 +1,7 @@ -$NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ - ---- configure.in.orig 2008-03-08 10:56:26.000000000 -0500 -+++ configure.in -@@ -38,6 +38,7 @@ AC_PREFIX_DEFAULT(/usr/local/samba) +$NetBSD: patch-au,v 1.9.12.1 2009/03/04 23:12:19 tron Exp $ +--- configure.in.orig 2008-08-25 22:09:21.000000000 +0100 ++++ configure.in 2009-03-03 17:11:54.000000000 +0000 +@@ -38,6 +38,7 @@ rootsbindir="\${SBINDIR}" lockdir="\${VARDIR}/locks" @@ -10,7 +9,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ piddir="\${VARDIR}/locks" test "${mandir}" || mandir="\${prefix}/man" logfilebase="\${VARDIR}" -@@ -51,7 +52,8 @@ AC_ARG_WITH(fhs, +@@ -51,7 +52,8 @@ [ --with-fhs Use FHS-compliant paths (default=no)], [ case "$withval" in yes) @@ -20,7 +19,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ piddir="\${VARDIR}/run" mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" -@@ -111,6 +113,22 @@ AC_ARG_WITH(lockdir, +@@ -111,6 +113,22 @@ esac]) ################################################# @@ -43,7 +42,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ # set pid directory location AC_ARG_WITH(piddir, [ --with-piddir=DIR Where to put pid files ($ac_default_prefix/var/locks)], -@@ -257,6 +275,7 @@ fi +@@ -257,6 +275,7 @@ AC_SUBST(configdir) AC_SUBST(lockdir) @@ -51,7 +50,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ AC_SUBST(piddir) AC_SUBST(logfilebase) AC_SUBST(privatedir) -@@ -1242,7 +1261,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit gr +@@ -1242,7 +1261,7 @@ AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf) AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64) AC_CHECK_FUNCS(getpwent_r) @@ -60,10 +59,10 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink) AC_CHECK_FUNCS(syslog vsyslog timegm) AC_CHECK_FUNCS(setlocale nl_langinfo) -@@ -2834,6 +2853,21 @@ if test x"$samba_cv_HAVE_IFACE_AIX" = x" - fi - - if test $iface = no; then +@@ -2821,6 +2840,20 @@ + ################## + # look for a method of finding the list of network interfaces + iface=no; +AC_CACHE_CHECK([for iface ifaddrs],samba_cv_HAVE_IFACE_IFADDRS,[ +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}" @@ -76,13 +75,20 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ +if test x"$samba_cv_HAVE_IFACE_IFADDRS" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_IFADDRS,1,[Whether iface ifaddrs is available]) +fi -+fi + +if test $iface = no; then - AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[ + AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[ SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}" -@@ -3524,7 +3558,7 @@ if test x"$with_ads_support" != x"no"; t +@@ -2834,6 +2867,7 @@ + if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available]) + fi ++fi + + if test $iface = no; then + AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[ +@@ -3526,7 +3560,7 @@ AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) # Heimdal checks. @@ -91,7 +97,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $ AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) -@@ -5769,31 +5803,39 @@ case "$host_os" in +@@ -5771,31 +5805,39 @@ NSSSONAMEVERSIONSUFFIX=".2" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" ;; |