diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
| commit | 78db264e7992131e0781bdfa5ede821305262b2d (patch) | |
| tree | 7461ae9dab5bf69f056250fc233c1ada393dc957 /libX11/configure.ac | |
| parent | 1d2fa791e7eb383cf2818bb2e33da546edbeade9 (diff) | |
| parent | 77a4732b0637493966889fe3545966fdc12a1b5e (diff) | |
| download | vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.gz vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.bz2 vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'libX11/configure.ac')
| -rw-r--r-- | libX11/configure.ac | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 45e9d74ce..655ea400f 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.2.99.901, + 1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) @@ -14,9 +14,9 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_HEADER([include/X11/XlibConf.h]) -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_CHANGELOG, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) # Set common system defines for POSIX extensions, such as _GNU_SOURCE # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) @@ -27,7 +27,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_PROG_LIBTOOL DOLT AC_PROG_CC -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS if test x"$CC_FOR_BUILD" = x; then if test x"$cross_compiling" = xyes; then @@ -40,6 +40,15 @@ AC_SUBST([CC_FOR_BUILD]) XORG_PROG_RAWCPP +# Find perl for "make check" tests in nls/localerules.in +AC_ARG_WITH(perl, + AC_HELP_STRING([--with-perl=<path>], + [path to perl interpreter for build-time tests]), + [PERL=$withval ; AC_MSG_CHECKING([perl]) ; + AC_MSG_RESULT([(from --with-perl) $PERL])], + AC_CHECK_PROGS([PERL], [perl], [no])) +AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno) + # Build with XCB support? AC_ARG_WITH(xcb, AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]), @@ -54,9 +63,18 @@ AC_SUBST(XPROTO_CFLAGS) case "$ac_cv_use_xcb" in no) X11_REQUIRES="xau xcmiscproto bigreqsproto" - X11_EXTRA_DEPS="xau xdmcp" - PKG_CHECK_MODULES(XDMCP, xdmcp) - AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) + X11_EXTRA_DEPS="xau" + PKG_CHECK_MODULES(XDMCP, xdmcp, + AC_CHECK_LIB(Xdmcp, XdmcpWrap, + [ + AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) + X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp" + ], + [ + XDMCP_CFLAGS= + XDMCP_LIBS= + ], [$XDMCP_LIBS]), + [AC_MSG_RESULT(no)]) AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation]) ;; *) @@ -321,8 +339,6 @@ AC_ARG_ENABLE(xkb, [Disable XKB support *EXPERIMENTAL*]), [XKB=$enableval],[XKB=yes]) -XORG_MANPAGE_SECTIONS - AC_ARG_ENABLE(man-pages, AC_HELP_STRING([--enable-man-pages=section], [Choose manual section for installing man pages]), @@ -410,10 +426,11 @@ AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database]) XERRORDB="${X11_DATADIR}/XErrorDB" AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) - XORG_CHECK_MALLOC_ZERO -XORG_RELEASE_VERSION -XORG_CHANGELOG + +# Support AM_SILENT_RULES if automake-1.11 or later is used +m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) +AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x) AC_OUTPUT([Makefile include/Makefile |