summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-10-13 20:30:38 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-10-13 20:30:38 +0000
commit1df705e465a103c94ffbb9fe97bdbe6b0aefc746 (patch)
tree02b56faebabe2b3e1278447304f3b5178d67ab10 /configure.ac
parentb349b20d783252d5126451142419aae554f9b776 (diff)
AC_SUBST VENDOR_STRING & VENDOR_RELEASE for xorgcfg's app-defaults file
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 0bc99b7da..1d7f6d62f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,7 +320,7 @@ AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ],
[ XKBPATH="${datadir}/X11/xkb" ])
AC_ARG_WITH(xkb-output, [ --with-xkb-output=PATH ],
[ XKBOUTPUT="$withval" ],
- [ XKBOUTPUT="compiled/" ])
+ [ XKBOUTPUT="compiled" ])
AC_ARG_WITH(rgb-path, [ --with-rgb-path=PATH ],
[ RGBPATH="$withval" ],
[ RGBPATH="${datadir}/X11/rgb" ])
@@ -608,6 +608,8 @@ AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release])
AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
+AC_SUBST([VENDOR_STRING])
+AC_SUBST([VENDOR_RELEASE])
AC_DEFINE(DDXOSINIT, 1, [Use OsVendorInit])
AC_DEFINE(SERVER_LOCK, 1, [Use a lock to prevent multiple servers on a display])