diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/summary.pm | 1 | ||||
| -rw-r--r-- | source4/configure.ac | 13 | ||||
| -rw-r--r-- | source4/main.mk | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index f6c1c50550..c7916216ab 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -57,6 +57,7 @@ sub show($$) showisexternal($output, "popt", "LIBPOPT"); showisexternal($output, "talloc", "LIBTALLOC"); showisexternal($output, "tdb", "LIBTDB"); + showisexternal($output, "tevent", "LIBTEVENT"); showisexternal($output, "ldb", "LIBLDB"); print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n"; print "Automatic dependencies: ". diff --git a/source4/configure.ac b/source4/configure.ac index aa5a3f3b3e..45154c8c88 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -34,7 +34,6 @@ m4_include(../nsswitch/nsstest.m4) m4_include(../pidl/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) -AC_CONFIG_FILES(../lib/tevent/tevent.pc) AC_CONFIG_FILES(librpc/dcerpc.pc) AC_CONFIG_FILES(../librpc/ndr.pc) AC_CONFIG_FILES(../lib/torture/torture.pc) @@ -61,6 +60,17 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3, SMB_INCLUDE_MK(../lib/tdb/python.mk) +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 1.0.0, + [], + [ + m4_include(../lib/tevent/libtevent.m4) + SMB_INCLUDE_MK(../lib/tevent/config.mk) + AC_CONFIG_FILES(../lib/tevent/tevent.pc) + ] +) + +SMB_INCLUDE_MK(../lib/tevent/python.mk) + SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1, [ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) @@ -96,7 +106,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1, SMB_INCLUDE_MK(lib/ldb/python.mk) m4_include(lib/tls/config.m4) -m4_include(../lib/tevent/libtevent.m4) dnl m4_include(auth/kerberos/config.m4) m4_include(auth/gensec/config.m4) diff --git a/source4/main.mk b/source4/main.mk index e54196a2f9..1d4ffc5d44 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -14,7 +14,6 @@ mkinclude lib/ldb-samba/config.mk mkinclude lib/tls/config.mk mkinclude lib/registry/config.mk mkinclude lib/messaging/config.mk -mkinclude ../lib/tevent/config.mk mkinclude lib/events/config.mk mkinclude lib/cmdline/config.mk mkinclude ../lib/socket_wrapper/config.mk |