Set default font path to match the default in the monolith so fonts are

actually found.
This commit is contained in:
Alan Coopersmith 2005-10-14 22:19:51 +00:00
parent 0ee70f53ef
commit d62943c040
2 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,15 @@
2005-10-14 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac:
Set default font path to match the default in the monolith so
fonts are actually found.
2005-10-14 Alan Coopersmith <alan.coopersmith@sun.com>
* hw/xfree86/Makefile.am:
* hw/xfree86/doc/Makefile.am:
Install Xorg & xorg.conf man pages even when not building docs
2005-10-14 Kristian Høgsberg <krh@redhat.com>
* hw/xfree86/os-support/Makefile.am (DIST_SUBDIRS): Add sysv and

View File

@ -312,9 +312,11 @@ AC_ARG_WITH(os-vendor, [ --with-os-vendor=OSVENDOR ],
AC_ARG_WITH(mesa-source, [ --with-mesa-source=MESA_SOURCE ],
[ MESA_SOURCE="$withval" ],
[ MESA_SOURCE="" ])
FONTDIR="${libdir}/X11/fonts"
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
AC_ARG_WITH(default-font-path, [ --with-default-font-path=PATH ],
[ FONTPATH="$withval" ],
[ FONTPATH="${datadir}/X11/fonts" ])
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ],
[ XKBPATH="$withval" ],
[ XKBPATH="${datadir}/X11/xkb" ])