diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
| commit | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (patch) | |
| tree | 6dd2d11e017529c66f2489000136201829dc3b9d /xorg-server/configure.ac | |
| parent | f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 (diff) | |
| download | vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.gz vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.bz2 vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.zip | |
xserver libX11 xkeyboard-config git update 30/9/2010
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 65ad00923..5fcc39bfb 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -601,9 +601,6 @@ AC_ARG_ENABLE(pc98, AC_HELP_STRING([--enable-pc98], [Enable PC98 support in [SUPPORT_PC98=auto])
dnl GLX build options
-AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
- [ DRI_DRIVER_PATH="$withval" ],
- [ DRI_DRIVER_PATH="${libdir}/dri" ])
AC_ARG_ENABLE(aiglx, AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
[AIGLX=$enableval],
[AIGLX=yes])
@@ -1258,7 +1255,8 @@ AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
-AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
+dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
+AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])
AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
|