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>

1 files changed, 1 insertions, 11 deletions

diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h
index 78eba553c1f..d167ec73435 100644
--- a/ctdb/include/internal/includes.h
+++ b/ctdb/include/internal/includes.h
@@ -38,17 +38,7 @@
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
 #endif
 
-struct timeval timeval_zero(void);
-bool timeval_is_zero(const struct timeval *tv);
-struct timeval timeval_current(void);
-struct timeval timeval_set(uint32_t secs, uint32_t usecs);
-int timeval_compare(const struct timeval *tv1, const struct timeval *tv2);
-struct timeval timeval_until(const struct timeval *tv1,
-			     const struct timeval *tv2);
-_PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
-double timeval_elapsed(struct timeval *tv);
-
 #include "lib/util/debug.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 
 #endif /* _CTDB_INCLUDES_H */