diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-15 16:41:57 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-10-06 12:34:33 +0200 |
| commit | 59c30257064518aae117784f02ba73bc3221bec6 (patch) | |
| tree | d4628991eb8d2e07047d08e21c9580b569a5da70 /ctdb/packaging | |
| parent | 43266be94552fe0c364e12d3c44fb54e453c123a (diff) | |
| download | samba-59c30257064518aae117784f02ba73bc3221bec6.tar.gz | |
ctdb-build: Change from ctdb-util to samba-util
Remove local lib/util and lib/tdb-wrap. Update wscript, packaging and
includes.h.
The only potentially surprising thing here is a fake samba-util
subsystem that just depends on samba-util-core. As explained in a
comment:
When a combined build is implemented, CTDB will wanted to build
against samba-util rather than samba-util-core. Similarly, other
Samba subsystems expect samba-util. So, for a standalone build,
just define a fake samba-util subsystem that pulls in
samba-util-core.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'ctdb/packaging')
| -rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 816520ae57e..42d70de8786 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -88,7 +88,7 @@ fi export CC CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \ - --builtin-libraries=replace,popt \ + --builtin-libraries=replace,popt,samba-debug,socket-blocking,tdb-wrap \ --bundled-libraries=!talloc,!tevent,!tdb \ --minimum-library-version=talloc:%libtalloc_version,tdb:%libtdb_version,tevent:%libtevent_version \ %if %with_pcp_pmda |