diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-04 17:58:56 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-04 18:57:18 +0100 |
| commit | 033428d7da12a6ddc741aa6c70c65eca57b6d182 (patch) | |
| tree | 2e248bbf036abebe86bee8524007034785bc0746 /source4 | |
| parent | f9cb82d547ec6fd05c8c5196016ed8f33dc8b300 (diff) | |
| download | samba-033428d7da12a6ddc741aa6c70c65eca57b6d182.tar.gz samba-033428d7da12a6ddc741aa6c70c65eca57b6d182.tar.bz2 samba-033428d7da12a6ddc741aa6c70c65eca57b6d182.zip | |
tevent: move samba4 stuff from libtevent.m4 to samba.m4
metze
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 7 | ||||
| -rw-r--r-- | source4/ntvfs/posix/config.m4 | 3 | ||||
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 4ce55c82ba..6c8fb0efc2 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -61,12 +61,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3, SMB_INCLUDE_MK(../lib/tdb/python.mk) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 0.9.2, - [], - [ - m4_include(../lib/tevent/libtevent.m4) - SMB_INCLUDE_MK(../lib/tevent/config.mk) - AC_CONFIG_FILES(../lib/tevent/tevent.pc) - ] + [],[m4_include(../lib/tevent/samba.m4)] ) SMB_INCLUDE_MK(../lib/tevent/python.mk) diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4 index fe1997b437..a6f79dfbb3 100644 --- a/source4/ntvfs/posix/config.m4 +++ b/source4/ntvfs/posix/config.m4 @@ -30,8 +30,7 @@ if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then SMB_ENABLE(BLKID,YES) fi -AC_CHECK_HEADERS(libaio.h) SMB_ENABLE(pvfs_aio,NO) -if test x"$ac_cv_header_libaio_h" = x"yes"; then +if test x"$tevent_cv_aio_support" = x"yes"; then SMB_ENABLE(pvfs_aio,YES) fi diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index ec1cdf3659..1d7949214a 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -29,7 +29,7 @@ pvfs_acl_nfs4_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_nfs4.o ################################################ [SUBSYSTEM::pvfs_aio] -PRIVATE_DEPENDENCIES = LIBTEVENT LIBAIO_LINUX +PRIVATE_DEPENDENCIES = LIBTEVENT LIBTEVENT_EXT ################################################ pvfs_aio_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_aio.o |