diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-09-15 05:06:54 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-09-15 05:06:54 +0000 |
| commit | 88d7eb1f7ed6afc85c07797838714f2601356018 (patch) | |
| tree | 106bc643afb3efc5f344212ef2b49c79d658a791 /configure.ac | |
| parent | 25a0ecdc1868f4b53225b92e8ccd222814e2da2a (diff) | |
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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index db56d08ce..5f72f6e40 100644 --- a/configure.ac +++ b/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]) |