diff options
| -rw-r--r-- | Xext/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 6ea3d7445..d0d23b77f 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -34,7 +34,6 @@ MODULE_SRCS = \ xcmisc.c # Extra configuration files ship with some extensions -SERVERCONFIGdir = $(libdir)/xserver SERVERCONFIG_DATA = # Optional sources included if extension enabled by configure.ac rules diff --git a/configure.ac b/configure.ac index 37199cf26..7ff712f63 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,9 @@ AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]), [ RGBPATH="$withval" ], [ RGBPATH="${datadir}/X11/rgb" ]) +AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]), + [ SERVERCONFIG="$withval" ], + [ SERVERCONFIG="${libdir}/xserver" ]) APPLE_APPLICATIONS_DIR="${bindir}/Applications" AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: ${bindir}/Applications)]), [ APPLE_APPLICATIONS_DIR="${withval}" ]. @@ -938,6 +941,7 @@ VENDOR_MAN_VERSION="Version ${VENDOR_VERSION_STRING}" AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path]) +AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path]) AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path]) AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path]) AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name]) |