diff options
| author | Kevin E Martin <kem@kem.org> | 2005-09-27 14:09:31 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-09-27 14:09:31 +0000 |
| commit | ca64aab609c3585234410cd8d908f8e1efe5c788 (patch) | |
| tree | 5731a01203ae9b3bf9dc42011cea6b69f4a80de7 /configure.ac | |
| parent | 1a4e30d508e62ab304722c3525748ff0e3c2899d (diff) | |
Add build system for building docs and fix setuid issues.
Add build system for sgml docs.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7411a6e7c..db6b5c130 100644 --- a/configure.ac +++ b/configure.ac @@ -317,6 +317,9 @@ AC_ARG_WITH(xkb-output, [ --with-xkb-output=PATH ], AC_ARG_WITH(rgb-path, [ --with-rgb-path=PATH ], [ RGBPATH="$withval" ], [ RGBPATH="${datadir}/X11/rgb" ]) +AC_ARG_ENABLE(builddocs, [ --enable-builddocs ], + [BUILDDOCS=$enableval], + [BUILDDOCS=no]) dnl Extensions. AC_ARG_ENABLE(composite, [ --disable-composite ], [COMPOSITE=$enableval], [COMPOSITE=yes]) @@ -350,6 +353,7 @@ AC_ARG_ENABLE(install-setuid, AS_HELP_STRING([--enable-install-setuid], [Install Xorg server as owned by root with setuid bit (default: auto)]), [SETUID=$enableval], [SETUID=auto]) +AC_MSG_CHECKING([to see if we can install the Xorg server as root]) if test "x$SETUID" = "xauto" ; then case $host_os in darwin*) SETUID="no" ;; @@ -359,7 +363,13 @@ if test "x$SETUID" = "xauto" ; then *) SETUID="yes" ;; esac esac + if test "x$SETUID" = xyes; then + touch testfile + chown root testfile > /dev/null 2>&1 || SETUID="no" + rm -f testfile + fi fi +AC_MSG_RESULT([$SETUID]) AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"]) dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro @@ -385,6 +395,14 @@ if test "x$INT10" = xyes; then AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) fi +dnl Handle building documentation +AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes) +if test "x$BUILDDOCS" = xyes; then + dnl Only build sgml docs when linuxdoc is available + AC_PATH_PROG(LINUXDOC, linuxdoc) +fi +AM_CONDITIONAL(BUILDSGMLDOCS, test "x$LINUXDOC" != x) + dnl --------------------------------------------------------------------------- dnl Extension section dnl --------------------------------------------------------------------------- @@ -852,7 +870,7 @@ if test "x$XORG" = xyes; then AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) # XXX HACK! if anyone cares about elfloader in 7.0 you need to # XXX do something smarter here. - AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader]) + AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader]) AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader]) AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)]) @@ -1089,6 +1107,8 @@ hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile +hw/xfree86/doc/Makefile +hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dummylib/Makefile hw/xfree86/exa/Makefile @@ -1124,6 +1144,7 @@ hw/xfree86/utils/scanpci/Makefile hw/xfree86/utils/xorgcfg/Makefile hw/xfree86/utils/xorgconfig/Makefile hw/dmx/config/Makefile +hw/dmx/doc/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile |