summaryrefslogtreecommitdiff
path: root/xserver/include
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-16 20:59:17 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-16 20:59:17 +0000
commit0f89778bb91852ec3345e971c072341ccc662853 (patch)
treed36727f30a62a75a023ea805029be8afc5ddd006 /xserver/include
parent3303f04e5d0542a9fb093f27c34331b7693c9ad2 (diff)
- merge xserver 1.1.99.903
- regen generated files
Diffstat (limited to 'xserver/include')
-rw-r--r--xserver/include/Makefile.in1
-rw-r--r--xserver/include/do-not-use-config.h.in12
-rw-r--r--xserver/include/xorg-config.h.in3
3 files changed, 16 insertions, 0 deletions
diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in
index 38f342505..e52500bb4 100644
--- a/xserver/include/Makefile.in
+++ b/xserver/include/Makefile.in
@@ -141,6 +141,7 @@ DBE_FALSE = @DBE_FALSE@
DBE_TRUE = @DBE_TRUE@
DEBUG_FALSE = @DEBUG_FALSE@
DEBUG_TRUE = @DEBUG_TRUE@
+DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
DEFS = @DEFS@
diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in
index a58f50320..7ea610dce 100644
--- a/xserver/include/do-not-use-config.h.in
+++ b/xserver/include/do-not-use-config.h.in
@@ -62,6 +62,9 @@
/* Use GetTimeInMillis */
#undef DDXTIME
+/* Default library install path */
+#undef DEFAULT_LIBRARY_PATH
+
/* Default log location */
#undef DEFAULT_LOGPREFIX
@@ -366,6 +369,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Internal define for Xinerama */
#undef PANORAMIX
diff --git a/xserver/include/xorg-config.h.in b/xserver/include/xorg-config.h.in
index c20b56e18..8dbc13a62 100644
--- a/xserver/include/xorg-config.h.in
+++ b/xserver/include/xorg-config.h.in
@@ -45,6 +45,9 @@
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
+/* Path to installed libraries. */
+#undef DEFAULT_LIBRARY_PATH
+
/* Path to server log file. */
#undef DEFAULT_LOGPREFIX