diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-04 19:27:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-05 15:07:36 +0100 |
| commit | 321d875af91941e3009cffaa6ff7b0718e7ddad3 (patch) | |
| tree | ea8716947f7651991b1c275c30fb84ea8af9569a | |
| parent | 83ff9d3bcd5cfe9d060a8b1f0695e5b66be47efd (diff) | |
| download | samba-321d875af91941e3009cffaa6ff7b0718e7ddad3.tar.gz samba-321d875af91941e3009cffaa6ff7b0718e7ddad3.tar.bz2 samba-321d875af91941e3009cffaa6ff7b0718e7ddad3.zip | |
s3: build lib/tevent staticly into samba3
metze
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/configure.in | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c13f5ae20a..d938b94ee0 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -359,7 +359,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \ lib/iconv.o lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \ lib/adt_tree.o lib/gencache.o \ - lib/module.o lib/events.o lib/ldap_escape.o @CHARSET_STATIC@ \ + lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ + lib/ldap_escape.o @CHARSET_STATIC@ \ lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ lib/file_id.o lib/idmap_cache.o diff --git a/source3/configure.in b/source3/configure.in index fc3cb261d4..6727181e1c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -31,6 +31,15 @@ for obj in ${TALLOC_OBJ}; do done AC_SUBST(LIBTALLOC_OBJ0) +m4_include(../lib/tevent/libtevent.m4) + +LIBTEVENT_OBJ0="" +for obj in ${TEVENT_OBJ}; do + LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}" +done +AC_SUBST(LIBTEVENT_OBJ0) +LIBS="${LIBS} ${TEVENT_LIBS}" + # TODO: These should come from m4_include(lib/tdb/libtdb.m4) # but currently this fails: things have to get merged from s4. tdbdir="../lib/tdb" @@ -50,6 +59,7 @@ AC_SUBST(LIBTDB_OBJ0) SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}" +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" |