[PATCH:xfs 4/4] Use config.h for autoconf output now that there's no conflict
Alan Coopersmith
alan.coopersmith at oracle.com
Fri Nov 11 22:49:10 PST 2011
Now that os/config.h is gone, no reason to special case and have
xfs-config.h for the autoconf generated header.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
.gitignore | 3 ---
configure.ac | 3 +--
difs/atom.c | 2 +-
difs/cache.c | 2 +-
difs/charinfo.c | 2 +-
difs/difsutils.c | 2 +-
difs/dispatch.c | 2 +-
difs/events.c | 2 +-
difs/extensions.c | 2 +-
difs/fontinfo.c | 2 +-
difs/fonts.c | 2 +-
difs/globals.c | 2 +-
difs/initfonts.c | 2 +-
difs/main.c | 2 +-
difs/resource.c | 2 +-
difs/swaprep.c | 2 +-
difs/swapreq.c | 2 +-
difs/tables.c | 2 +-
include/servermd.h | 2 +-
os/access.c | 2 +-
os/config.c | 2 +-
os/connection.c | 2 +-
os/daemon.c | 2 +-
os/error.c | 2 +-
os/io.c | 2 +-
os/osglue.c | 2 +-
os/osinit.c | 2 +-
os/utils.c | 2 +-
os/waitfor.c | 2 +-
os/xfstrans.c | 2 +-
30 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/.gitignore b/.gitignore
index f18a5d9..e4efc3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,3 @@ core
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
xfs
-xfs-config.h
-xfs-config.h.in
-
diff --git a/configure.ac b/configure.ac
index a7c9b2b..cb2a340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,7 @@ AC_INIT([xfs],
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
AC_USE_SYSTEM_EXTENSIONS
-# xfs already have a header called config.h
-AC_CONFIG_HEADERS([xfs-config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake
diff --git a/difs/atom.c b/difs/atom.c
index 66646f1..17ed085 100644
--- a/difs/atom.c
+++ b/difs/atom.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include "misc.h"
#include "fsresource.h"
diff --git a/difs/cache.c b/difs/cache.c
index da30596..06fca6c 100644
--- a/difs/cache.c
+++ b/difs/cache.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include "cachestr.h"
#include "misc.h"
diff --git a/difs/charinfo.c b/difs/charinfo.c
index 6fc8e03..6a05082 100644
--- a/difs/charinfo.c
+++ b/difs/charinfo.c
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
* the font library interface as util/fsfuncs.c.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xos.h>
#include "misc.h"
diff --git a/difs/difsutils.c b/difs/difsutils.c
index 1028a3c..67b3454 100644
--- a/difs/difsutils.c
+++ b/difs/difsutils.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#define XK_LATIN1
diff --git a/difs/dispatch.c b/difs/dispatch.c
index bb05613..8c549fa 100644
--- a/difs/dispatch.c
+++ b/difs/dispatch.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdlib.h>
#include "dispatch.h"
diff --git a/difs/events.c b/difs/events.c
index 79e59b1..d702842 100644
--- a/difs/events.c
+++ b/difs/events.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <swaprep.h>
diff --git a/difs/extensions.c b/difs/extensions.c
index a360700..86ce68e 100644
--- a/difs/extensions.c
+++ b/difs/extensions.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/FSproto.h>
#include "misc.h"
diff --git a/difs/fontinfo.c b/difs/fontinfo.c
index 5208089..9c3e374 100644
--- a/difs/fontinfo.c
+++ b/difs/fontinfo.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
diff --git a/difs/fonts.c b/difs/fonts.c
index a3fe1a2..20ef7f0 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
*/
/*#define DEBUG*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
diff --git a/difs/globals.c b/difs/globals.c
index bda1572..67543f4 100644
--- a/difs/globals.c
+++ b/difs/globals.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/FSproto.h>
#include "clientstr.h"
diff --git a/difs/initfonts.c b/difs/initfonts.c
index b0f75db..1a3c7b4 100644
--- a/difs/initfonts.c
+++ b/difs/initfonts.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/font.h>
#include "difs.h"
diff --git a/difs/main.c b/difs/main.c
index ec68867..9e8e957 100644
--- a/difs/main.c
+++ b/difs/main.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdlib.h>
#include <sys/types.h>
diff --git a/difs/resource.c b/difs/resource.c
index b469aba..b8a93be 100644
--- a/difs/resource.c
+++ b/difs/resource.c
@@ -63,7 +63,7 @@ in this Software without prior written authorization from The Open Group.
* 1 - allocated color to be freed when the client dies
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/fonts/FS.h>
#include "misc.h"
diff --git a/difs/swaprep.c b/difs/swaprep.c
index 38447ff..2cefb0b 100644
--- a/difs/swaprep.c
+++ b/difs/swaprep.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <swaprep.h>
#include <swapreq.h>
diff --git a/difs/swapreq.c b/difs/swapreq.c
index 6d67b2e..3db8f99 100644
--- a/difs/swapreq.c
+++ b/difs/swapreq.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <swapreq.h>
diff --git a/difs/tables.c b/difs/tables.c
index ef8c0dc..e5a4664 100644
--- a/difs/tables.c
+++ b/difs/tables.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <dispatch.h>
#include <swaprep.h>
diff --git a/include/servermd.h b/include/servermd.h
index dd60045..948e429 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
#ifndef _SERVERMD_H_
#define _SERVERMD_H_
-#include <xfs-config.h>
+#include <config.h>
#ifndef VENDOR_RELEASE
# if defined PACKAGE_VERSION_MAJOR
diff --git a/os/access.c b/os/access.c
index 36c459c..da46556 100644
--- a/os/access.c
+++ b/os/access.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xos.h>
#include <sys/param.h>
diff --git a/os/config.c b/os/config.c
index bf2c47e..9f79f54 100644
--- a/os/config.c
+++ b/os/config.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/os/connection.c b/os/connection.c
index c086036..02d34e6 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -67,7 +67,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdlib.h>
#include <X11/Xtrans/Xtrans.h>
diff --git a/os/daemon.c b/os/daemon.c
index e1f826e..45a8e3e 100644
--- a/os/daemon.c
+++ b/os/daemon.c
@@ -28,7 +28,7 @@ from the X Consortium.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xos.h>
#include <sys/types.h>
diff --git a/os/error.c b/os/error.c
index 8d97547..d868ede 100644
--- a/os/error.c
+++ b/os/error.c
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/os/io.c b/os/io.c
index 8d9659a..a21fd57 100644
--- a/os/io.c
+++ b/os/io.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
diff --git a/os/osglue.c b/os/osglue.c
index 2a16a9a..d2c3c36 100644
--- a/os/osglue.c
+++ b/os/osglue.c
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
* Catalogue support, alternate servers, and cloneing
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xtrans/Xtrans.h>
#include "osstruct.h"
diff --git a/os/osinit.c b/os/osinit.c
index dcefe28..dbbaa7a 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include "os.h"
#include "globals.h"
diff --git a/os/utils.c b/os/utils.c
index 2ca608a..ff382c7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* THIS SOFTWARE.
*/
-#include "xfs-config.h"
+#include "config.h"
#include <stdio.h>
#include <X11/Xos.h>
diff --git a/os/waitfor.c b/os/waitfor.c
index 4e80eba..d09b0dc 100644
--- a/os/waitfor.c
+++ b/os/waitfor.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#include "xfs-config.h"
+#include "config.h"
#include <X11/Xos.h> /* strings, time, etc */
diff --git a/os/xfstrans.c b/os/xfstrans.c
index afacf26..b2e2dc7 100644
--- a/os/xfstrans.c
+++ b/os/xfstrans.c
@@ -20,7 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#include <xfs-config.h>
+#include <config.h>
#define FONT_t 1
#define TRANS_REOPEN 1
--
1.7.3.2
More information about the xorg-devel
mailing list