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.
This commit is contained in:
parent
e72c85547b
commit
4474c200a1
|
@ -146,6 +146,7 @@ hw/xwin/winprefsyacc.c
|
||||||
hw/xwin/winprefsyacc.h
|
hw/xwin/winprefsyacc.h
|
||||||
include/dix-config.h
|
include/dix-config.h
|
||||||
include/kdrive-config.h
|
include/kdrive-config.h
|
||||||
|
include/version-config.h
|
||||||
include/xkb-config.h
|
include/xkb-config.h
|
||||||
include/xorg-config.h
|
include/xorg-config.h
|
||||||
include/xorg-server.h
|
include/xorg-server.h
|
||||||
|
|
10
configure.ac
10
configure.ac
|
@ -54,6 +54,9 @@ dnl xwin-config.h covers the XWin DDX.
|
||||||
AC_CONFIG_HEADERS(include/xwin-config.h)
|
AC_CONFIG_HEADERS(include/xwin-config.h)
|
||||||
dnl kdrive-config.h covers the kdrive DDX
|
dnl kdrive-config.h covers the kdrive DDX
|
||||||
AC_CONFIG_HEADERS(include/kdrive-config.h)
|
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
|
AC_PROG_CC
|
||||||
AM_PROG_AS
|
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(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
|
||||||
AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
|
AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
|
||||||
|
|
||||||
AC_SUBST([VENDOR_NAME])
|
|
||||||
AC_SUBST([VENDOR_NAME_SHORT])
|
AC_SUBST([VENDOR_NAME_SHORT])
|
||||||
AC_SUBST([VENDOR_RELEASE])
|
AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name])
|
||||||
AC_SUBST([VENDOR_MAN_VERSION])
|
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])
|
AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
noinst_LTLIBRARIES = libdix.la
|
noinst_LTLIBRARIES = libdix.la
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) \
|
AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
-DVENDOR_NAME=\""@VENDOR_NAME@"\" \
|
|
||||||
-DVENDOR_RELEASE="@VENDOR_RELEASE@"
|
|
||||||
|
|
||||||
libdix_la_SOURCES = \
|
libdix_la_SOURCES = \
|
||||||
atom.c \
|
atom.c \
|
||||||
|
|
|
@ -76,6 +76,7 @@ Equipment Corporation.
|
||||||
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
#ifdef HAVE_DIX_CONFIG_H
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
|
#include <version-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
Loading…
Reference in New Issue