tevent: move samba4 stuff from libtevent.m4 to samba.m4

metze

8 files changed, 36 insertions, 81 deletions

diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk
deleted file mode 100644
index 90548b636a..0000000000
--- a/lib/tevent/config.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################
-[MODULE::TEVENT_AIO]
-PRIVATE_DEPENDENCIES = LIBAIO_LINUX
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = LIBTEVENT
-##############################
-
-TEVENT_AIO_OBJ_FILES = $(libteventsrcdir)/tevent_aio.o
-
-##############################
-[MODULE::TEVENT_EPOLL]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = LIBTEVENT
-##############################
-
-TEVENT_EPOLL_OBJ_FILES = $(libteventsrcdir)/tevent_epoll.o
-
-##############################
-[MODULE::TEVENT_SELECT]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = LIBTEVENT
-##############################
-
-TEVENT_SELECT_OBJ_FILES = $(libteventsrcdir)/tevent_select.o
-
-##############################
-[MODULE::TEVENT_STANDARD]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = LIBTEVENT
-##############################
-
-TEVENT_STANDARD_OBJ_FILES = $(libteventsrcdir)/tevent_standard.o
-
-################################################
-# Start SUBSYSTEM LIBTEVENT
-[LIBRARY::LIBTEVENT]
-PUBLIC_DEPENDENCIES = LIBTALLOC
-OUTPUT_TYPE = MERGED_OBJ
-CFLAGS = -I../lib/tevent
-#
-# End SUBSYSTEM LIBTEVENT
-################################################
-
-LIBTEVENT_OBJ_FILES = $(addprefix $(libteventsrcdir)/, tevent.o tevent_fd.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o)
-
-PUBLIC_HEADERS += $(addprefix $(libteventsrcdir)/, tevent.h tevent_internal.h)
diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
index 747e4799f4..3cc06a144a 100644
--- a/lib/tevent/configure.ac
+++ b/lib/tevent/configure.ac
@@ -1,11 +1,8 @@
 AC_PREREQ(2.50)
-AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
-AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
-AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_INIT(tevent, 0.9.2)
 AC_CONFIG_SRCDIR([tevent.c])
 AC_CONFIG_HEADER(config.h)
+
 AC_LIBREPLACE_ALL_CHECKS
 
 AC_LD_EXPORT_DYNAMIC
diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
index df432655b0..ec2ed9cd1f 100644
--- a/lib/tevent/libtevent.m4
+++ b/lib/tevent/libtevent.m4
@@ -1,12 +1,14 @@
 dnl find the tevent sources. This is meant to work both for
 dnl standalone builds, and builds of packages using libtevent
+
+AC_SUBST(teventdir)
+
 if test x"$teventdir" = "x"; then
 	teventdir=""
 	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
 	for d in $teventpaths; do
 		if test -f "$d/tevent.c"; then
 			teventdir="$d"
-			AC_SUBST(teventdir)
 			break;
 		fi
 	done
@@ -15,35 +17,32 @@ if test x"$teventdir" = "x"; then
 	fi
 fi
 
+TEVENT_OBJ=""
+TEVENT_CFLAGS=""
+TEVENT_LIBS=""
+AC_SUBST(TEVENT_OBJ)
+AC_SUBST(TEVENT_CFLAGS)
+AC_SUBST(TEVENT_LIBS)
+
+TEVENT_CFLAGS="-I$teventdir"
+
 TEVENT_OBJ="tevent.o tevent_fd.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o"
 TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
 
-SMB_ENABLE(TEVENT_EPOLL, NO)
-SMB_ENABLE(TEVENT_AIO, NO)
+tevent_cv_aio_support=no
 AC_CHECK_HEADERS(sys/epoll.h)
 AC_CHECK_FUNCS(epoll_create)
 if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
    TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
-   SMB_ENABLE(TEVENT_EPOLL,YES)
    AC_DEFINE(HAVE_EPOLL, 1, [Whether epoll available])
 
    # check for native Linux AIO interface
    AC_CHECK_HEADERS(libaio.h)
-   AC_CHECK_LIB_EXT(aio, AIO_LIBS, io_getevents)
+   AC_CHECK_LIB_EXT(aio, TEVENT_LIBS, io_getevents)
    if test x"$ac_cv_header_libaio_h" = x"yes" -a x"$ac_cv_lib_ext_aio_io_getevents" = x"yes";then
       TEVENT_OBJ="$TEVENT_OBJ tevent_aio.o"
-      SMB_ENABLE(TEVENT_AIO,YES)
+      tevent_cv_aio_support=yes
       AC_DEFINE(HAVE_LINUX_AIO, 1, [Whether Linux AIO is available])
    fi
 fi
 
-AC_SUBST(TEVENT_OBJ)
-SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS)
-
-TEVENT_CFLAGS="-I$teventdir"
-AC_SUBST(TEVENT_CFLAGS)
-
-TEVENT_LIBS="$AIO_LIBS"
-AC_SUBST(TEVENT_LIBS)
-
-
diff --git a/lib/tevent/samba.m4 b/lib/tevent/samba.m4
new file mode 100644
index 0000000000..89b0b705b4
--- /dev/null
+++ b/lib/tevent/samba.m4
@@ -0,0 +1,16 @@
+
+teventdir="\$(libteventsrcdir)"
+m4_include(../lib/tevent/libtevent.m4)
+
+SMB_EXT_LIB(LIBTEVENT_EXT, [${TEVENT_LIBS}])
+SMB_ENABLE(LIBTEVENT_EXT)
+
+SMB_SUBSYSTEM(LIBTEVENT,
+	[\$(addprefix \$(libteventsrcdir)/, ${TEVENT_OBJ})],
+	[LIBTEVENT_EXT],
+	[${TEVENT_CFLAGS}])
+
+SMB_MAKE_SETTINGS([
+PUBLIC_HEADERS += \$(addprefix \$(libteventsrcdir)/, tevent.h tevent_internal.h)
+])
+
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index fe3995dfa0..a7916ef794 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -66,12 +66,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/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