Attachment #62606 for bug #93552

View | Details | Raw Unified | Return to bug 93552
Collapse All | Expand All




#

PORTNAME=		samba
PORTVERSION?=		3.0.21b
PORTREVISION?=		0
PORTEPOCH?=		1
CATEGORIES?=		net

CONFLICTS?=		ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*

USE_ICONV=		yes
GNU_CONFIGURE=		yes
USE_AUTOTOOLS=		autoconf:259 autoheader:259

LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}

SAMBA_PRIVATE?=		${PREFIX}/private
SAMBA_CONFDIR?=		${PREFIX}/etc
SAMBA_SWATDIR=		${PREFIX}/share/swat
SAMBA_LIB=		lib
SAMBA_LIBDIR=		${PREFIX}/${SAMBA_LIB}
RC_DIR=			${PREFIX}/etc/rc.d
SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf



CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}

.if !defined(SAMBA_SUBPORT)
# Switch off all extra functionality
CONFIGURE_ARGS+=	--disable-cups

CONFIGURE_ARGS+=	--without-ldap
CONFIGURE_ARGS+=	--without-krb5
CONFIGURE_ARGS+=	--without-ads

CONFIGURE_ARGS+=	--without-winbind

CONFIGURE_ARGS+=	--without-syslog
CONFIGURE_ARGS+=	--without-quotas
CONFIGURE_ARGS+=	--without-utmp
CONFIGURE_ARGS+=	--without-ldapsam
CONFIGURE_ARGS+=	--without-pam
CONFIGURE_ARGS+=	--without-pam_smbpass
CONFIGURE_ARGS+=	--without-aio-support
.else
# Samba server itself
OPTIONS=	LDAP		"With LDAP support" on \
		ADS		"With Active Directory support" off \


.include <bsd.port.pre.mk>

.if defined(SAMBA_SUBPORT)
# Switch off all extra functionality
CONFIGURE_ARGS+=	--disable-cups --without-winbind --without-syslog \
			--without-quotas --without-utmp --without-ldapsam \
			--without-pam --without-pam_smbpass --without-aio-support

# Dirty hack to work around usage of OPTIONS in slave ports
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif

.else
# Samba server itself
USE_RC_SUBR=		yes

CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \

.endif

.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
WANT_EXPSAM_MODULES!=	${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -E 's/ +/,/g'
CONFIGURE_ARGS+=	--with-expsam=${WANT_EXPSAM_MODULES}
.endif
# SAM

.if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
WANT_EXP_MODULES=	rpc_echo idmap_ad idmap_rid charset_weird
.endif
WANT_EXP_MODULES!=	${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -E 's/ +/,/g'
CONFIGURE_ARGS+=	--with-shared-modules=${WANT_EXP_MODULES}
.endif


.else
CONFIGURE_ARGS+=	--with-included-popt
.endif
# !SAMBA_SUBPORT
.endif

###
### Common part for port and it's subports
###
# For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken
# due the conflict between system and OpenSSL port libcrypto libraries
.if ${OSVERSION} > 470103 && ${OSVERSION} < 500000

CONFIGURE_ARGS+=	--without-ldap
.endif

.if !defined(SAMBA_SUBPORT)
# Samba server itself
MAN1=		findsmb.1 log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 \
		rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
		smbget.1 smbsh.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 \

	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r

pre-install:
	-@${FIND} ${SAMBA_LIBDIR}/samba -type f 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' >> ${WRKDIR}/.PLIST.exclude

post-install:
.for sect in 1 5 7 8

.if defined(WITH_WINBIND_NSS)
	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
	${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
	${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
.endif
	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
	${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
.endif
.if defined(WITH_PAM_SMBPASS)
	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
	${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
.endif
# Lib
	@${FIND} ${SAMBA_LIBDIR}/samba -type f | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
	@for d in `${FIND} ${SAMBA_LIBDIR}/samba -type d | ${SORT} -r`; do \
	    ${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null || true" >> ${TMPPLIST}; \
	done

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (samba-3.0.21a.tar.gz) = b5306d2681e97e4499daf7845581d116	1	MD5 (samba-3.0.21b.tar.gz) = bb73dffb33f4a39386ef9f3e07ae28ff
2	SHA256 (samba-3.0.21a.tar.gz) = 8f4902db38b20601cc3315fe9516a9380b067678c5a6828bd67e5a8bc46b097c	2	SHA256 (samba-3.0.21b.tar.gz) = a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0
3	SIZE (samba-3.0.21a.tar.gz) = 17524018	3	SIZE (samba-3.0.21b.tar.gz) = 17539079




--- configure.in.orig	Mon Jan 30 15:45:07 2006
+++ configure.in	Sun Feb 19 07:00:42 2006
@@ -967,6 +967,21 @@
    AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
 fi
 

+	samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
+if test x"$samba_cv_struct_sigevent" = x"yes"; then
+   AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
+   AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
+	[#include <signal.h>])
+fi
+
 AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
     AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -4104,30 +4119,28 @@
 
 	case "$host_os" in
 	*)
-		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$ACL_LIBS -lrt"])
+		ac_cv_save_LIBS=$LIBS
+		AC_SEARCH_LIBS(aio_read, [rt], [
+			if test "$ac_cv_search_aio_read" != "none required"; then
+				LIBS="$LIBS $ac_cv_search_aio_read"
+			fi
+		])
 		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
-		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb a; return aio_read(&a);],
-samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)
-		LIBS=$aio_LIBS])
+samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)])
 		AC_CACHE_CHECK([for 64-bit asynchronous io support],samba_cv_HAVE_AIO64,[
-		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb64 a; return aio_read64(&a);],
-samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)
-		LIBS=$aio_LIBS])
+samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)])
+		
 		if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
 			AC_DEFINE(HAVE_AIOCB64,1,[Whether 64 bit aio is available])
-			AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
-			LIBS="$LIBS -lrt"
+			AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
 		elif test x"$samba_cv_HAVE_AIO" = x"yes"; then
-			AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
-			LIBS="$LIBS -lrt"
+			AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
 		fi
             ;;
         esac

Return to bug 93552

Lines 6-12 Link Here

(-)Makefile (-26 / +32 lines)
6	#	6	#
7		7
8	PORTNAME= samba	8	PORTNAME= samba
9	PORTVERSION?= 3.0.21a	9	PORTVERSION?= 3.0.21b
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	PORTEPOCH?= 1	11	PORTEPOCH?= 1
12	CATEGORIES?= net	12	CATEGORIES?= net
Lines 20-26 Link Here
20	CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*	20	CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
21		21
22	USE_ICONV= yes	22	USE_ICONV= yes
23	#GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	USE_AUTOTOOLS= autoconf:259 autoheader:259	24	USE_AUTOTOOLS= autoconf:259 autoheader:259
25		25
26	LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}	26	LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
Lines 36-42 Link Here
36	SAMBA_PRIVATE?= ${PREFIX}/private	36	SAMBA_PRIVATE?= ${PREFIX}/private
37	SAMBA_CONFDIR?= ${PREFIX}/etc	37	SAMBA_CONFDIR?= ${PREFIX}/etc
38	SAMBA_SWATDIR= ${PREFIX}/share/swat	38	SAMBA_SWATDIR= ${PREFIX}/share/swat
39	SAMBA_LIBDIR= ${PREFIX}/lib	39	SAMBA_LIB= lib
		40	SAMBA_LIBDIR= ${PREFIX}/${SAMBA_LIB}
40	RC_DIR= ${PREFIX}/etc/rc.d	41	RC_DIR= ${PREFIX}/etc/rc.d
41	SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf	42	SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf
42		43
Lines 54-77 Link Here
54		55
55	CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}	56	CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
56		57
57	.if defined(SAMBA_SUBPORT)	58	.if !defined(SAMBA_SUBPORT)
58	# Switch off all extra functionality
59	CONFIGURE_ARGS+= --disable-cups
60
61	CONFIGURE_ARGS+= --without-ldap
62	CONFIGURE_ARGS+= --without-krb5
63	CONFIGURE_ARGS+= --without-ads
64
65	CONFIGURE_ARGS+= --without-winbind
66
67	CONFIGURE_ARGS+= --without-syslog
68	CONFIGURE_ARGS+= --without-quotas
69	CONFIGURE_ARGS+= --without-utmp
70	CONFIGURE_ARGS+= --without-ldapsam
71	CONFIGURE_ARGS+= --without-pam
72	CONFIGURE_ARGS+= --without-pam_smbpass
73	CONFIGURE_ARGS+= --without-aio-support
74	.else
75	# Samba server itself	59	# Samba server itself
76	OPTIONS= LDAP "With LDAP support" on \	60	OPTIONS= LDAP "With LDAP support" on \
77	ADS "With Active Directory support" off \	61	ADS "With Active Directory support" off \
Lines 94-101 Link Here
94		78
95	.include <bsd.port.pre.mk>	79	.include <bsd.port.pre.mk>
96		80
97	.if !defined(SAMBA_SUBPORT)	81	.if defined(SAMBA_SUBPORT)
		82	# Switch off all extra functionality
		83	CONFIGURE_ARGS+= --disable-cups --without-winbind --without-syslog \
		84	--without-quotas --without-utmp --without-ldapsam \
		85	--without-pam --without-pam_smbpass --without-aio-support
		86
		87	# Dirty hack to work around usage of OPTIONS in slave ports
		88	.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
		89	.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
		90	.endif
98		91
		92	.else
		93	# Samba server itself
99	USE_RC_SUBR= yes	94	USE_RC_SUBR= yes
100		95
101	CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \	96	CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \
Lines 187-193 Link Here
187	.endif	182	.endif
188		183
189	.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)	184	.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
190	WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} \| ${SED} -e 's/ /,/g'	185	WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} \| ${SED} -E 's/ +/,/g'
191	CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES}	186	CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES}
192	.endif	187	.endif
193	# SAM	188	# SAM
Lines 195-201 Link Here
195	.if !defined(WANT_EXP_MODULES) \|\| empty(WANT_EXP_MODULES)	190	.if !defined(WANT_EXP_MODULES) \|\| empty(WANT_EXP_MODULES)
196	WANT_EXP_MODULES= rpc_echo idmap_ad idmap_rid charset_weird	191	WANT_EXP_MODULES= rpc_echo idmap_ad idmap_rid charset_weird
197	.endif	192	.endif
198	WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} \| ${SED} -e 's/ /,/g'	193	WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} \| ${SED} -E 's/ +/,/g'
199	CONFIGURE_ARGS+= --with-shared-modules=${WANT_EXP_MODULES}	194	CONFIGURE_ARGS+= --with-shared-modules=${WANT_EXP_MODULES}
200	.endif	195	.endif
201		196
Lines 225-231 Link Here
225	.else	220	.else
226	CONFIGURE_ARGS+= --with-included-popt	221	CONFIGURE_ARGS+= --with-included-popt
227	.endif	222	.endif
		223	# !SAMBA_SUBPORT
		224	.endif
228		225
		226	###
		227	### Common part for port and it's subports
		228	###
229	# For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken	229	# For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken
230	# due the conflict between system and OpenSSL port libcrypto libraries	230	# due the conflict between system and OpenSSL port libcrypto libraries
231	.if ${OSVERSION} > 470103 && ${OSVERSION} < 500000	231	.if ${OSVERSION} > 470103 && ${OSVERSION} < 500000
Lines 265-270 Link Here
265	CONFIGURE_ARGS+= --without-ldap	265	CONFIGURE_ARGS+= --without-ldap
266	.endif	266	.endif
267		267
		268	.if !defined(SAMBA_SUBPORT)
		269	# Samba server itself
268	MAN1= findsmb.1 log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 \	270	MAN1= findsmb.1 log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 \
269	rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \	271	rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
270	smbget.1 smbsh.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 \	272	smbget.1 smbsh.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 \
Lines 316-322 Link Here
316	@${FIND} ${WRKDIR}/${DISTNAME} -type f \| ${XARGS} ${CHMOD} u+w,a+r	318	@${FIND} ${WRKDIR}/${DISTNAME} -type f \| ${XARGS} ${CHMOD} u+w,a+r
317		319
318	pre-install:	320	pre-install:
319	-@${FIND} ${SAMBA_LIBDIR} -type f 2>/dev/null \| ${SORT} \| ${SED} -e 's\|^${PREFIX}\|\|; s\|^/\|\|' >> ${WRKDIR}/.PLIST.exclude	321	-@${FIND} ${SAMBA_LIBDIR}/samba -type f 2>/dev/null \| ${SORT} \| ${SED} -E 's\|^${PREFIX}/?\|\|;' >> ${WRKDIR}/.PLIST.exclude
320		322
321	post-install:	323	post-install:
322	.for sect in 1 5 7 8	324	.for sect in 1 5 7 8
Lines 342-355 Link Here
342	.if defined(WITH_WINBIND_NSS)	344	.if defined(WITH_WINBIND_NSS)
343	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1	345	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
344	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1	346	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
		347	${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
		348	${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
345	.endif	349	.endif
346	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}	350	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
		351	${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
347	.endif	352	.endif
348	.if defined(WITH_PAM_SMBPASS)	353	.if defined(WITH_PAM_SMBPASS)
349	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}	354	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
		355	${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
350	.endif	356	.endif
351	# Lib	357	# Lib
352	@${FIND} ${SAMBA_LIBDIR} -type f \| ${SED} -e 's\|^${PREFIX}\|\|; s\|^/\|\|' \| ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude \| ${SORT} >> ${TMPPLIST}	358	@${FIND} ${SAMBA_LIBDIR}/samba -type f \| ${SED} -E 's\|^${PREFIX}/?\|\|;' \| ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude \| ${SORT} >> ${TMPPLIST}
353	@for d in `${FIND} ${SAMBA_LIBDIR}/samba -type d \| ${SORT} -r`; do \	359	@for d in `${FIND} ${SAMBA_LIBDIR}/samba -type d \| ${SORT} -r`; do \
354	${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null \|\| true" >> ${TMPPLIST}; \	360	${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null \|\| true" >> ${TMPPLIST}; \
355	done	361	done

Lines 1-6 Link Here

(-)files/patch-configure.in (-46 / +4 lines)
1	--- configure.in.orig Tue Jul 12 18:42:55 2005	1	--- configure.in.orig Mon Jan 30 15:45:07 2006
2	+++ configure.in Tue Jul 26 19:19:40 2005	2	+++ configure.in Sun Feb 19 07:00:42 2006
3	@@ -909,6 +909,21 @@	3	@@ -967,6 +967,21 @@
4	AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])	4	AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
5	fi	5	fi
6		6
Lines 15-66 Link Here
15	+ samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])	15	+ samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
16	+if test x"$samba_cv_struct_sigevent" = x"yes"; then	16	+if test x"$samba_cv_struct_sigevent" = x"yes"; then
17	+ AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])	17	+ AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
18	+ AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr],,,	18	+ AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
19	+ [#include <signal.h>])	19	+ [#include <signal.h>])
20	+fi	20	+fi
21	+	21	+
22	AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [	22	AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
23	AC_TRY_COMPILE([	23	AC_TRY_COMPILE([
24	#include <sys/types.h>	24	#include <sys/types.h>
25	@@ -4104,30 +4119,28 @@
26
27	case "$host_os" in
28	*)
29	- AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$ACL_LIBS -lrt"])
30	+ ac_cv_save_LIBS=$LIBS
31	+ AC_SEARCH_LIBS(aio_read, [rt], [
32	+ if test "$ac_cv_search_aio_read" != "none required"; then
33	+ LIBS="$LIBS $ac_cv_search_aio_read"
34	+ fi
35	+ ])
36	AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
37	- aio_LIBS=$LIBS
38	- LIBS="$LIBS -lrt"
39	AC_TRY_LINK([#include <sys/types.h>
40	#include <aio.h>],
41	[ struct aiocb a; return aio_read(&a);],
42	-samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)
43	- LIBS=$aio_LIBS])
44	+samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)])
45	AC_CACHE_CHECK([for 64-bit asynchronous io support],samba_cv_HAVE_AIO64,[
46	- aio_LIBS=$LIBS
47	- LIBS="$LIBS -lrt"
48	AC_TRY_LINK([#include <sys/types.h>
49	#include <aio.h>],
50	[ struct aiocb64 a; return aio_read64(&a);],
51	-samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)
52	- LIBS=$aio_LIBS])
53	+samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)])
54	+
55	if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
56	AC_DEFINE(HAVE_AIOCB64,1,[Whether 64 bit aio is available])
57	- AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
58	- LIBS="$LIBS -lrt"
59	+ AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
60	elif test x"$samba_cv_HAVE_AIO" = x"yes"; then
61	- AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
62	- LIBS="$LIBS -lrt"
63	+ AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
64	fi
65	;;
66	esac