svn commit: samba r12837 - branches/SAMBA_3_0/source trunk/source

[vlendec at samba.org]

Author: vlendec
Date: 2006-01-11 10:21:23 +0000 (Wed, 11 Jan 2006)
New Revision: 12837

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12837

Log:
- configure check for Tru64 EA functions (not yet implemented)
- find Tru64 AIO lib in configure

Thanks to Bj?\195?\182rn Jacke <bj at sernet.de>

Volker

Modified:
   branches/SAMBA_3_0/source/configure.in
   trunk/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-01-11 00:56:49 UTC (rev 12836)
+++ branches/SAMBA_3_0/source/configure.in	2006-01-11 10:21:23 UTC (rev 12837)
@@ -795,7 +795,7 @@
 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)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
+AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h sys/proplist.h)
 AC_CHECK_HEADERS(sys/cdefs.h glob.h)
 
 AC_CHECK_HEADERS(netinet/ip.h,,,[[
@@ -1345,12 +1345,23 @@
 
 ############################################
 # Check if we have libattr
-AC_SEARCH_LIBS(getxattr, [attr])
-AC_CHECK_FUNCS(getxattr lgetxattr fgetxattr listxattr llistxattr)
-AC_CHECK_FUNCS(flistxattr removexattr lremovexattr fremovexattr)
-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)
+case "$host_os" in
+  *osf*)
+	AC_SEARCH_LIBS(getproplist, [proplist])
+	AC_CHECK_FUNCS(getproplist fgetproplist setproplist fsetproplist)
+	AC_CHECK_FUNCS(delproplist fdelproplist add_proplist_entry get_proplist_entry)
+	AC_CHECK_FUNCS(sizeof_proplist_entry)
+  ;;
+  *)
+	AC_SEARCH_LIBS(getxattr, [attr])
+	AC_CHECK_FUNCS(getxattr lgetxattr fgetxattr listxattr llistxattr)
+	AC_CHECK_FUNCS(flistxattr removexattr lremovexattr fremovexattr)
+	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)
+  ;;
+esac
+
 # Check if we have extattr
 case "$host_os" in
   *freebsd4* | *dragonfly* )
@@ -4478,9 +4489,10 @@
 	case "$host_os" in
 	*)
 		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$ACL_LIBS -lrt"])
+		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$ACL_LIBS -laio"])
 		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
 		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
+		LIBS=$AIO_LIBS
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb a; return aio_read(&a);],
@@ -4488,7 +4500,7 @@
 		LIBS=$aio_LIBS])
 		AC_CACHE_CHECK([for 64-bit asynchronous io support],samba_cv_HAVE_AIO64,[
 		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
+		LIBS=$AIO_LIBS
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb64 a; return aio_read64(&a);],
@@ -4497,10 +4509,10 @@
 		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"
+			LIBS=$AIO_LIBS
 		elif test x"$samba_cv_HAVE_AIO" = x"yes"; then
 			AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
-			LIBS="$LIBS -lrt"
+			LIBS=$AIO_LIBS
 		fi
 
 		if test x"$samba_cv_HAVE_AIO" = x"yes"; then

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2006-01-11 00:56:49 UTC (rev 12836)
+++ trunk/source/configure.in	2006-01-11 10:21:23 UTC (rev 12837)
@@ -795,7 +795,7 @@
 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)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
+AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h sys/proplist.h)
 AC_CHECK_HEADERS(sys/cdefs.h glob.h)
 
 AC_CHECK_HEADERS(netinet/ip.h,,,[[
@@ -1345,12 +1345,23 @@
 
 ############################################
 # Check if we have libattr
-AC_SEARCH_LIBS(getxattr, [attr])
-AC_CHECK_FUNCS(getxattr lgetxattr fgetxattr listxattr llistxattr)
-AC_CHECK_FUNCS(flistxattr removexattr lremovexattr fremovexattr)
-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)
+case "$host_os" in
+  *osf*)
+	AC_SEARCH_LIBS(getproplist, [proplist])
+	AC_CHECK_FUNCS(getproplist fgetproplist setproplist fsetproplist)
+	AC_CHECK_FUNCS(delproplist fdelproplist add_proplist_entry get_proplist_entry)
+	AC_CHECK_FUNCS(sizeof_proplist_entry)
+  ;;
+  *)
+	AC_SEARCH_LIBS(getxattr, [attr])
+	AC_CHECK_FUNCS(getxattr lgetxattr fgetxattr listxattr llistxattr)
+	AC_CHECK_FUNCS(flistxattr removexattr lremovexattr fremovexattr)
+	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)
+  ;;
+esac
+
 # Check if we have extattr
 case "$host_os" in
   *freebsd4* | *dragonfly* )
@@ -4506,9 +4517,10 @@
 	case "$host_os" in
 	*)
 		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$ACL_LIBS -lrt"])
+		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$ACL_LIBS -laio"])
 		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
 		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
+		LIBS=$AIO_LIBS
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb a; return aio_read(&a);],
@@ -4516,7 +4528,7 @@
 		LIBS=$aio_LIBS])
 		AC_CACHE_CHECK([for 64-bit asynchronous io support],samba_cv_HAVE_AIO64,[
 		aio_LIBS=$LIBS
-		LIBS="$LIBS -lrt"
+		LIBS=$AIO_LIBS
 		AC_TRY_LINK([#include <sys/types.h>
 #include <aio.h>],
 [ struct aiocb64 a; return aio_read64(&a);],
@@ -4525,10 +4537,10 @@
 		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"
+			LIBS=$AIO_LIBS
 		elif test x"$samba_cv_HAVE_AIO" = x"yes"; then
 			AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
-			LIBS="$LIBS -lrt"
+			LIBS=$AIO_LIBS
 		fi
 
 		if test x"$samba_cv_HAVE_AIO" = x"yes"; then