On Tue, Sep 21, 2010 at 5:44 PM, Gaetan Nadon <[email protected]> wrote: > The trusted location of the dri driver directory can be obtained > from the mesa dri.pc pkg-config file. > > Reviewed-by: Dan Nicholson <[email protected]> > Signed-off-by: Gaetan Nadon <[email protected]> > --- > configure.ac | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 9884fa7..13ff8eb 100644 > --- a/configure.ac > +++ b/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]) > -- > 1.6.0.4 > > For release management, master.
Looks like a smart thing to do. Acked-by: Matt Turner <[email protected]> _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
