rename ccan/typesafe_cb.h to ctdb_typesafe_cb.h and

add this file to the install/rpm

diff --git a/Makefile.in b/Makefile.in
index 7b3c6214f64e316acae75ee85a1e007af8bbcf7a..30cbf2eacf5109f17c4d63e285746c4727b22690 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,7 @@ install: all
        ${INSTALLCMD} -m 644 include/ctdb_client.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 include/ctdb_protocol.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
+       ${INSTALLCMD} -m 644 include/ctdb_typesafe_cb.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb
        ${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
        ${INSTALLCMD} -m 755 config/interface_modify.sh $(DESTDIR)$(etcdir)/ctdb

diff --git a/include/ctdb.h b/include/ctdb.h
index bd4fdc12b16cef47bae226d0b6840f9e3fece611..040cd0c2e47d263cc6006a6f8b13a929469f89a2 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -211,7 +211,7 @@ int ctdb_cancel(struct ctdb_request *);
 
 
 /* These ugly macro wrappers make the callbacks typesafe. */
-#include <ccan/typesafe_cb.h>
+#include <ctdb_typesafe_cb.h>
 #define ctdb_sendcb(cb, cbdata)                                                \
         typesafe_cb_preargs(void, (cb), (cbdata),                      \
                             struct ctdb_connection *, struct ctdb_request *)

diff --git a/include/ccan/typesafe_cb.h b/include/ctdb_typesafe_cb.h
similarity index 100%
rename from include/ccan/typesafe_cb.h
rename to include/ctdb_typesafe_cb.h

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 738921344a6523079fdab64d1174b94ba80c67da..6706672cc0a4073d15412d7ba8b719117181eb0b 100644 (file)
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ctdb_client.h
 %{_includedir}/ctdb_protocol.h
 %{_includedir}/ctdb_private.h
+%{_includedir}/ctdb_typesafe_cb.h
 %{_libdir}/libctdb.a
 
 %changelog