diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 11:50:00 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 11:50:00 +0100 |
commit | 1c5e713cceb6a4467540043df4087fe3f9f335d5 (patch) | |
tree | 1c93f2ab8c76694a91d8e57394f77f4b872fec8b /source4/configure.ac | |
parent | 6c2d4f2806bae8072d61ba8795832d9a9e75573e (diff) | |
parent | 5d55aa99e6488244208d7d84b188f92306c083f6 (diff) | |
download | samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.tar.gz samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.tar.bz2 samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit 64babbec22f165e34799d36ff4b76806d9fead50)
Diffstat (limited to 'source4/configure.ac')
-rw-r--r-- | source4/configure.ac | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 23fc1023ad..ed74bc1251 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -27,20 +27,20 @@ m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) -AC_OUTPUT(lib/registry/registry.pc) -AC_OUTPUT(librpc/dcerpc.pc) -AC_OUTPUT(librpc/ndr.pc) -AC_OUTPUT(torture/torture.pc) -AC_OUTPUT(auth/gensec/gensec.pc) -AC_OUTPUT(param/samba-config.pc) -AC_OUTPUT(librpc/dcerpc_samr.pc) +AC_CONFIG_FILES(lib/registry/registry.pc) +AC_CONFIG_FILES(librpc/dcerpc.pc) +AC_CONFIG_FILES(librpc/ndr.pc) +AC_CONFIG_FILES(torture/torture.pc) +AC_CONFIG_FILES(auth/gensec/gensec.pc) +AC_CONFIG_FILES(param/samba-config.pc) +AC_CONFIG_FILES(librpc/dcerpc_samr.pc) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0, [], [ m4_include(lib/talloc/libtalloc.m4) SMB_INCLUDE_MK(lib/talloc/config.mk) - AC_OUTPUT(lib/talloc/talloc.pc) + AC_CONFIG_FILES(lib/talloc/talloc.pc) ] ) @@ -49,7 +49,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, [ m4_include(lib/tdb/libtdb.m4) SMB_INCLUDE_MK(lib/tdb/config.mk) - AC_OUTPUT(lib/tdb/tdb.pc) + AC_CONFIG_FILES(lib/tdb/tdb.pc) ] ) @@ -60,7 +60,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1, SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk) SMB_SUBSYSTEM(ldb_map, [], [LIBLDB]) - AC_OUTPUT(lib/ldb/ldb.pc) define_ldb_modulesdir=no ], [ @@ -84,6 +83,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1, m4_include(lib/ldb/sqlite3.m4) m4_include(lib/ldb/libldb.m4) SMB_INCLUDE_MK(lib/ldb/config.mk) + AC_CONFIG_FILES(lib/ldb/ldb.pc) ] ) SMB_INCLUDE_MK(lib/ldb/python.mk) |