diff --git a/ChangeLog b/ChangeLog index 8cca2d4b6..1ce2a1fd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-07 Kevin E. Martin + + * configure.ac: + * hw/xfree86/utils/xorgcfg/Makefile.am: + Change to use the app-defaults default dir configured in libXt. + 2005-12-06 Kevin E. Martin * Xprint/doc/Makefile.am: diff --git a/configure.ac b/configure.ac index 9136f8b4a..7f381d93e 100644 --- a/configure.ac +++ b/configure.ac @@ -1290,6 +1290,9 @@ if test x$XORGCFG = xyes ; then [CURSES=no])) AC_SUBST(XORGCFG_DEP_CFLAGS) AC_SUBST(XORGCFG_DEP_LIBS) + + appdefaultdir=$(pkg-config --variable=appdefaultdir xt) + AC_SUBST(appdefaultdir) fi AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes]) AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes]) diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 5f9d78f7e..2bc812a49 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -120,7 +120,7 @@ include $(top_srcdir)/cpprules.in # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = XOrgCfg