diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-08 14:17:39 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-04-14 10:35:44 -0400 |
| commit | 4474c200a102feda72f9572a96cb588009aa0147 (patch) | |
| tree | 4fbe5d31b6a4dde9d2ae5dcb33ef0c3b419e6161 | |
| parent | e72c85547b405fbd0117dc1236e5ca5a2126063c (diff) | |
Move VENDOR_* defines from AC_SUBST to a header to avoid angering shave.
This is more sane anyway, as it ensures a rebuild when changing them.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | dix/Makefile.am | 4 | ||||
| -rw-r--r-- | dix/main.c | 1 | ||||
| -rw-r--r-- | include/version-config.h.in | 16 |
5 files changed, 26 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 4d277d98e..df9006a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -146,6 +146,7 @@ hw/xwin/winprefsyacc.c hw/xwin/winprefsyacc.h include/dix-config.h include/kdrive-config.h +include/version-config.h include/xkb-config.h include/xorg-config.h include/xorg-server.h diff --git a/configure.ac b/configure.ac index 93ef0bd23..c5084f056 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,9 @@ dnl xwin-config.h covers the XWin DDX. AC_CONFIG_HEADERS(include/xwin-config.h) dnl kdrive-config.h covers the kdrive DDX AC_CONFIG_HEADERS(include/kdrive-config.h) +dnl version-config.h covers the version numbers so they can be bumped without +dnl forcing an entire recompile.x +AC_CONFIG_HEADERS(include/version-config.h) AC_PROG_CC AM_PROG_AS @@ -1120,10 +1123,11 @@ AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name]) AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor]) AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string]) -AC_SUBST([VENDOR_NAME]) AC_SUBST([VENDOR_NAME_SHORT]) -AC_SUBST([VENDOR_RELEASE]) -AC_SUBST([VENDOR_MAN_VERSION]) +AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name]) +AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name]) +AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release]) +AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper]) diff --git a/dix/Makefile.am b/dix/Makefile.am index 8c5f3c00e..83b8c62c2 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -1,8 +1,6 @@ noinst_LTLIBRARIES = libdix.la -AM_CFLAGS = $(DIX_CFLAGS) \ - -DVENDOR_NAME=\""@VENDOR_NAME@"\" \ - -DVENDOR_RELEASE="@VENDOR_RELEASE@" +AM_CFLAGS = $(DIX_CFLAGS) libdix_la_SOURCES = \ atom.c \ diff --git a/dix/main.c b/dix/main.c index e10f7e1a4..9d5d83944 100644 --- a/dix/main.c +++ b/dix/main.c @@ -76,6 +76,7 @@ Equipment Corporation. #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#include <version-config.h> #endif #include <X11/X.h> diff --git a/include/version-config.h.in b/include/version-config.h.in new file mode 100644 index 000000000..8180dff8e --- /dev/null +++ b/include/version-config.h.in @@ -0,0 +1,16 @@ +/* version-config.h.in: not generated */ + +#ifndef VERSION_CONFIG_H +#define VERSION_CONFIG_H + +/* Vendor man version */ +#undef VENDOR_MAN_VERSION + +/* Vendor name */ +#undef VENDOR_NAME + +/* Vendor release */ +#undef VENDOR_RELEASE + +#endif /* VERSION_CONFIG_H */ + |