Change to use the app-defaults default dir configured in libXt.
This commit is contained in:
parent
4a39354e14
commit
20c0ebe7b3
|
@ -1,3 +1,9 @@
|
||||||
|
2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||||
|
|
||||||
|
* 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 <kem-at-freedesktop-dot-org>
|
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||||
|
|
||||||
* Xprint/doc/Makefile.am:
|
* Xprint/doc/Makefile.am:
|
||||||
|
|
|
@ -1290,6 +1290,9 @@ if test x$XORGCFG = xyes ; then
|
||||||
[CURSES=no]))
|
[CURSES=no]))
|
||||||
AC_SUBST(XORGCFG_DEP_CFLAGS)
|
AC_SUBST(XORGCFG_DEP_CFLAGS)
|
||||||
AC_SUBST(XORGCFG_DEP_LIBS)
|
AC_SUBST(XORGCFG_DEP_LIBS)
|
||||||
|
|
||||||
|
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
|
||||||
|
AC_SUBST(appdefaultdir)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes])
|
AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes])
|
||||||
AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes])
|
AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes])
|
||||||
|
|
|
@ -120,7 +120,7 @@ include $(top_srcdir)/cpprules.in
|
||||||
|
|
||||||
# App default files (*.ad)
|
# App default files (*.ad)
|
||||||
|
|
||||||
appdefaultdir = $(libdir)/X11/app-defaults
|
appdefaultdir = @appdefaultdir@
|
||||||
|
|
||||||
APPDEFAULTFILES = XOrgCfg
|
APPDEFAULTFILES = XOrgCfg
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user