diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2005-07-20 04:17:44 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2005-07-20 04:17:44 +0000 |
commit | 3712c48039265444fe74e2886e6268fb9eb4dfd2 (patch) | |
tree | 6445362658b684372eb7a4d61fedd1528d5d5ad7 /net/samba3/files/patch-configure.in | |
parent | Fix build on 4.x (diff) |
- Unbreak net/samba3 and japanese/samba3 on 7-current.
- Portability changes for 4.x.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=139642
Diffstat (limited to 'net/samba3/files/patch-configure.in')
-rw-r--r-- | net/samba3/files/patch-configure.in | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in index 368939ca41bc..264d8495296a 100644 --- a/net/samba3/files/patch-configure.in +++ b/net/samba3/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig Fri Mar 11 14:47:05 2005 -+++ configure.in Sun Mar 20 01:24:25 2005 -@@ -724,7 +724,9 @@ +--- configure.in.orig Thu Apr 14 08:14:26 2005 ++++ configure.in Wed Jul 20 02:42:57 2005 +@@ -727,7 +727,9 @@ AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h) AC_CHECK_HEADERS(stropts.h poll.h) AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h) @@ -11,7 +11,7 @@ # These faile to compile on Solaris so just check for their presence AC_CHECK_HEADERS(security/pam_modules.h net/if.h netinet/ip.h, [], [], -) -@@ -1159,6 +1161,18 @@ +@@ -1162,6 +1164,18 @@ AC_CHECK_FUNCS(setxattr lsetxattr fsetxattr) AC_CHECK_FUNCS(attr_get attr_list attr_set attr_remove) AC_CHECK_FUNCS(attr_getf attr_listf attr_setf attr_removef) @@ -30,3 +30,21 @@ # Assume non-shared by default and override below BLDSHARED="false" +@@ -3974,7 +3988,7 @@ + AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available]) + ACL_LIBS="$ACL_LIBS -lpacl" + ;; +- *freebsd5*|*freebsd6*) ++ *freebsd[[5-9]]*) + AC_MSG_RESULT(Using FreeBSD posix ACLs) + AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available]) + AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available]) +@@ -4322,7 +4336,7 @@ + *linux*) + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" + ;; +- *freebsd5*|*freebsd6*) ++ *freebsd[[5-9]]*) + # FreeBSD winbind client is implemented as a wrapper around + # the Linux version. + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ |