cluster: master - build: rename config.h to clusterautoconfig.h
Fabio M. Di Nitto
fabbione@fedoraproject.org
Sat May 30 04:49:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2a71ebed5ab5f4089899c977b3f132d72b8f184f
Commit: 2a71ebed5ab5f4089899c977b3f132d72b8f184f
Parent: 7577d43e262029a270376609532748c952049d37
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Sat May 30 06:47:10 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Sat May 30 06:47:10 2009 +0200
build: rename config.h to clusterautoconfig.h
config.h is simply too generic and it clashes with other tons
of config.h we have in the tree.
make the name unique across our projects.
this change requires corosync svn 2200 to build that includes
a fix in corosync public headers that were including config.h
by mistake.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
.gitignore | 2 +-
Makefile.am | 3 ++-
cman/cman_tool/join.c | 2 +-
cman/cman_tool/main.c | 2 +-
cman/config/cman-preconfig.c | 2 +-
cman/notifyd/main.c | 2 +-
cman/qdisk/bitmap.c | 2 +-
cman/qdisk/daemon_init.c | 2 +-
cman/qdisk/disk.c | 2 +-
cman/qdisk/disk_util.c | 2 +-
cman/qdisk/iostate.c | 2 +-
cman/qdisk/main.c | 2 +-
cman/qdisk/mkqdisk.c | 2 +-
cman/qdisk/proc.c | 2 +-
cman/qdisk/scandisk.c | 2 +-
cman/qdisk/score.c | 2 +-
cman/services/cman/lib/libcman.c | 2 +-
cman/services/cman/services/cman.c | 2 +-
cman/tests/client.c | 2 +-
cman/tests/libtest.c | 2 +-
cman/tests/qwait.c | 2 +-
cman/tests/sysman.c | 2 +-
cman/tests/sysmand.c | 2 +-
cman/tests/user_service.c | 2 +-
common/liblogthread/liblogthread.c | 2 +-
config/libs/libccsconfdb/extras.c | 2 +-
config/libs/libccsconfdb/fullxpath.c | 2 +-
config/libs/libccsconfdb/libccs.c | 2 +-
config/libs/libccsconfdb/xpathlite.c | 2 +-
config/plugins/ldap/configldap.c | 2 +-
config/plugins/xml/config.c | 2 +-
config/tools/ccs_tool/ccs_tool.c | 2 +-
config/tools/ccs_tool/editconf.c | 2 +-
config/tools/ldap/confdb2ldif.c | 2 +-
config/tools/mkconf/mkconf.c | 2 +-
configure.ac | 2 +-
group/tool/main.c | 2 +-
37 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/.gitignore b/.gitignore
index 29e19b4..ca3e49c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
*.pc
*.la
*.lo
-make/config.h*
+make/clusterautoconfig.h*
make/stamp-h1
Makefile.in
Makefile
diff --git a/Makefile.am b/Makefile.am
index aa33bca..b845c7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
config.guess config.sub missing install-sh \
autoheader automake autoconf libtool libtoolize \
- ltmain.sh compile make/config.h.in make/config.h.in~
+ ltmain.sh compile make/clusterautoconfig.h.in \
+ make/clusterautoconfig.h.in~
noinst_HEADERS = make/copyright.cf
diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c
index 85bd222..2245eb3 100644
--- a/cman/cman_tool/join.c
+++ b/cman/cman_tool/join.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/wait.h>
#include <stdint.h>
diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index b300116..ddc2326 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <inttypes.h>
#include <unistd.h>
diff --git a/cman/config/cman-preconfig.c b/cman/config/cman-preconfig.c
index f3c700e..af31834 100644
--- a/cman/config/cman-preconfig.c
+++ b/cman/config/cman-preconfig.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c
index 9795205..83e27f5 100644
--- a/cman/notifyd/main.c
+++ b/cman/notifyd/main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/bitmap.c b/cman/qdisk/bitmap.c
index 121d381..d893c98 100644
--- a/cman/qdisk/bitmap.c
+++ b/cman/qdisk/bitmap.c
@@ -1,7 +1,7 @@
/** @file
* Bitmap and membership mask handling routines.
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdint.h>
diff --git a/cman/qdisk/daemon_init.c b/cman/qdisk/daemon_init.c
index 7b34db6..1b71738 100644
--- a/cman/qdisk/daemon_init.c
+++ b/cman/qdisk/daemon_init.c
@@ -11,7 +11,7 @@
* Also need to add file locking for the pid file.
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c
index 55aa556..5aad792 100644
--- a/cman/qdisk/disk.c
+++ b/cman/qdisk/disk.c
@@ -12,7 +12,7 @@
* copy is performed along with the IO operation itself.
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index f6fbe2b..fc56d1d 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -2,7 +2,7 @@
@file Misc. Quorum daemon context utilities / high-level functions
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/iostate.c b/cman/qdisk/iostate.c
index 5ec98c6..4c67b8f 100644
--- a/cman/qdisk/iostate.c
+++ b/cman/qdisk/iostate.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <pthread.h>
#include <iostate.h>
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 7eb644d..ef31e2d 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -2,7 +2,7 @@
@file Main loop / functions for disk-based quorum daemon.
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#define SYSLOG_NAMES
#include <stdio.h>
diff --git a/cman/qdisk/mkqdisk.c b/cman/qdisk/mkqdisk.c
index 41774a1..80d1f8a 100644
--- a/cman/qdisk/mkqdisk.c
+++ b/cman/qdisk/mkqdisk.c
@@ -2,7 +2,7 @@
@file Quorum disk utility
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/proc.c b/cman/qdisk/proc.c
index 4ed7bb3..5f5f4b7 100644
--- a/cman/qdisk/proc.c
+++ b/cman/qdisk/proc.c
@@ -2,7 +2,7 @@
@file Quorum disk /proc/partition scanning functions
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index de55593..8195e00 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <time.h>
diff --git a/cman/qdisk/score.c b/cman/qdisk/score.c
index d0b4e4d..70cd500 100644
--- a/cman/qdisk/score.c
+++ b/cman/qdisk/score.c
@@ -2,7 +2,7 @@
@file Quorum daemon scoring functions + thread.
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c
index 9012ba2..c2caf8e 100644
--- a/cman/services/cman/lib/libcman.c
+++ b/cman/services/cman/lib/libcman.c
@@ -2,7 +2,7 @@
* Provides a cman API using the corosync executive
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/cman/services/cman/services/cman.c b/cman/services/cman/services/cman.c
index 1456ba6..7e96bd5 100644
--- a/cman/services/cman/services/cman.c
+++ b/cman/services/cman/services/cman.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#ifndef COROSYNC_BSD
#include <alloca.h>
diff --git a/cman/tests/client.c b/cman/tests/client.c
index d3009a5..0950a7b 100644
--- a/cman/tests/client.c
+++ b/cman/tests/client.c
@@ -1,5 +1,5 @@
/* test client */
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/cman/tests/libtest.c b/cman/tests/libtest.c
index c5bea25..ce007b7 100644
--- a/cman/tests/libtest.c
+++ b/cman/tests/libtest.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <netinet/in.h>
#include <inttypes.h>
diff --git a/cman/tests/qwait.c b/cman/tests/qwait.c
index f0bcd67..1200307 100644
--- a/cman/tests/qwait.c
+++ b/cman/tests/qwait.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/cman/tests/sysman.c b/cman/tests/sysman.c
index fac803b..1f61844 100644
--- a/cman/tests/sysman.c
+++ b/cman/tests/sysman.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
/* "sysman" client */
#include <sys/types.h>
diff --git a/cman/tests/sysmand.c b/cman/tests/sysmand.c
index 70576d9..05a5572 100644
--- a/cman/tests/sysmand.c
+++ b/cman/tests/sysmand.c
@@ -11,7 +11,7 @@
Any command passed to it will be run as root!
*/
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/cman/tests/user_service.c b/cman/tests/user_service.c
index 097173d..039aa72 100644
--- a/cman/tests/user_service.c
+++ b/cman/tests/user_service.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <pthread.h>
#include <stdio.h>
diff --git a/common/liblogthread/liblogthread.c b/common/liblogthread/liblogthread.c
index df7ffb0..54c9d38 100644
--- a/common/liblogthread/liblogthread.c
+++ b/common/liblogthread/liblogthread.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdlib.h>
#include <stdarg.h>
diff --git a/config/libs/libccsconfdb/extras.c b/config/libs/libccsconfdb/extras.c
index 3bcdb6a..207faac 100644
--- a/config/libs/libccsconfdb/extras.c
+++ b/config/libs/libccsconfdb/extras.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <ctype.h>
#include <errno.h>
diff --git a/config/libs/libccsconfdb/fullxpath.c b/config/libs/libccsconfdb/fullxpath.c
index 9a84dc5..5b4c1af 100644
--- a/config/libs/libccsconfdb/fullxpath.c
+++ b/config/libs/libccsconfdb/fullxpath.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <string.h>
#include <errno.h>
diff --git a/config/libs/libccsconfdb/libccs.c b/config/libs/libccsconfdb/libccs.c
index 4be6b94..c7e67db 100644
--- a/config/libs/libccsconfdb/libccs.c
+++ b/config/libs/libccsconfdb/libccs.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/config/libs/libccsconfdb/xpathlite.c b/config/libs/libccsconfdb/xpathlite.c
index 848156f..0086668 100644
--- a/config/libs/libccsconfdb/xpathlite.c
+++ b/config/libs/libccsconfdb/xpathlite.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c
index 5e30308..273d702 100644
--- a/config/plugins/ldap/configldap.c
+++ b/config/plugins/ldap/configldap.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <stdlib.h>
diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
index 1ac62f1..5a53ba8 100644
--- a/config/plugins/xml/config.c
+++ b/config/plugins/xml/config.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <string.h>
#include <syslog.h>
diff --git a/config/tools/ccs_tool/ccs_tool.c b/config/tools/ccs_tool/ccs_tool.c
index bdc42f6..a00f0dc 100644
--- a/config/tools/ccs_tool/ccs_tool.c
+++ b/config/tools/ccs_tool/ccs_tool.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c
index 444cee6..5205257 100644
--- a/config/tools/ccs_tool/editconf.c
+++ b/config/tools/ccs_tool/editconf.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/config/tools/ldap/confdb2ldif.c b/config/tools/ldap/confdb2ldif.c
index d10dd7f..4dd92fc 100644
--- a/config/tools/ldap/confdb2ldif.c
+++ b/config/tools/ldap/confdb2ldif.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/config/tools/mkconf/mkconf.c b/config/tools/mkconf/mkconf.c
index 6da7007..3870e11 100644
--- a/config/tools/mkconf/mkconf.c
+++ b/config/tools/mkconf/mkconf.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <stdio.h>
diff --git a/configure.ac b/configure.ac
index 937a2b3..d2cd861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ LT_INIT
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([config/plugins/xml/config.c])
-AC_CONFIG_HEADERS([make/config.h])
+AC_CONFIG_HEADERS([make/clusterautoconfig.h])
AC_CANONICAL_HOST
diff --git a/group/tool/main.c b/group/tool/main.c
index ee91f70..aed540f 100644
--- a/group/tool/main.c
+++ b/group/tool/main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clusterautoconfig.h"
#include <sys/types.h>
#include <sys/un.h>
More information about the Cluster-cvs
mailing list