Bug #3889: Create the log dir on install, and allow configuring
specifically that directory. Failure to have the directory keeps the xorg server from starting.
This commit is contained in:
parent
25a0ecdc18
commit
88d7eb1f7e
|
@ -1,3 +1,11 @@
|
|||
2005-09-14 Eric Anholt <anholt@FreeBSD.org>
|
||||
|
||||
* configure.ac:
|
||||
* hw/xfree86/Makefile.am:
|
||||
Bug #3889: Create the log dir on install, and allow configuring
|
||||
specifically that directory. Failure to have the directory keeps the
|
||||
xorg server from starting.
|
||||
|
||||
2005-09-14 Eric Anholt <anholt@FreeBSD.org>
|
||||
|
||||
* hw/xfree86/xf8_32bpp/Makefile.am:
|
||||
|
|
10
configure.ac
10
configure.ac
|
@ -282,9 +282,14 @@ AC_ARG_WITH(vendor-release, [ --with-vendor-release=RELEASE ],
|
|||
AC_ARG_WITH(vendor-web, [ --with-vendor-web=URL ],
|
||||
[ VENDOR_WEB="$withval" ],
|
||||
[ VENDOR_WEB="$DEFAULT_VENDOR_WEB" ])
|
||||
AC_ARG_WITH(module-dir, [ --with-module-dir=DIR ],
|
||||
AC_ARG_WITH(module-dir, AS_HELP_STRING([--with-module-dir=DIR],
|
||||
[directory where modules are installed (default: $libdir/xorg/modules)]),
|
||||
[ moduledir="$withval" ],
|
||||
[ moduledir="${libdir}/xorg/modules" ])
|
||||
AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR],
|
||||
[directory where log files are kept (default: $localstatedir/log)]),
|
||||
[ logdir="$withval" ],
|
||||
[ logdir="$localstatedir/log" ])
|
||||
AC_ARG_WITH(builder-addr, [ --with-builder-addr=ADDRESS ],
|
||||
[ BUILDERADDR="$withval" ],
|
||||
[ BUILDERADDR="xorg@lists.freedesktop.org" ])
|
||||
|
@ -801,7 +806,7 @@ if test "x$XORG" = xyes; then
|
|||
|
||||
dnl these only go in xorg-config.h
|
||||
CONFIGFILE="$sysconfdir/xorg.conf"
|
||||
LOGPREFIX="$localstatedir/log/Xorg."
|
||||
LOGPREFIX="$logdir/Xorg."
|
||||
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
|
||||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
|
||||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
|
||||
|
@ -830,6 +835,7 @@ if test "x$XORG" = xyes; then
|
|||
extdir="$includedir/X11/extensions"
|
||||
AC_SUBST([sdkdir])
|
||||
AC_SUBST([extdir])
|
||||
AC_SUBST([logdir])
|
||||
fi
|
||||
AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
|
||||
|
|
|
@ -63,3 +63,6 @@ BUILT_SOURCES = os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il
|
|||
os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il:
|
||||
cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il
|
||||
endif
|
||||
|
||||
install-data-local:
|
||||
$(mkdir_p) $(logdir)
|
||||
|
|
Loading…
Reference in New Issue