diff options
Diffstat (limited to 'libX11/configure.ac')
| -rw-r--r-- | libX11/configure.ac | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index d62269747..0eea575c7 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,31 +3,32 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.3.2, + 1.3.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_HEADER([include/X11/XlibConf.h]) -# 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) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.4) # 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) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS +XORG_DEFAULT_OPTIONS # Checks for programs. AC_PROG_LIBTOOL DOLT AC_PROG_CC -XORG_DEFAULT_OPTIONS if test x"$CC_FOR_BUILD" = x; then if test x"$cross_compiling" = xyes; then @@ -57,12 +58,15 @@ AC_CACHE_CHECK([whether to use XCB], [ac_cv_use_xcb], [ac_cv_use_xcb=yes]) AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno) # Checks for pkg-config packages -PKG_CHECK_MODULES(XPROTO, [xproto >= 7.0.13]) -AC_SUBST(XPROTO_CFLAGS) + +# Always required +X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans' + +PKG_PROG_PKG_CONFIG() case "$ac_cv_use_xcb" in no) - X11_REQUIRES="xau xcmiscproto bigreqsproto" + X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto" X11_EXTRA_DEPS="xau" PKG_CHECK_MODULES(XDMCP, xdmcp, AC_CHECK_LIB(Xdmcp, XdmcpWrap, @@ -78,14 +82,13 @@ no) AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation]) ;; *) - X11_REQUIRES="xcb >= 1.1.92" + X11_REQUIRES="${X11_REQUIRES} xcb >= 1.1.92" X11_EXTRA_DEPS="xcb >= 1.1.92" xdmauth="no" # XCB handles all auth AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation]) ;; esac AC_SUBST(X11_EXTRA_DEPS) -PKG_CHECK_MODULES(X11, xextproto xtrans $X11_REQUIRES) dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro dnl was not expanded, since libX11 with no transport types is rather useless. @@ -261,7 +264,6 @@ if test x$xthreads = xyes ; then fi AC_SUBST(XTHREADLIB) AC_SUBST(XTHREAD_CFLAGS) -X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" case x$xdmauth in xyes) @@ -353,10 +355,8 @@ AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN '!=' xno ]) AM_CONDITIONAL(XKB, [ test x$XKB = xyes ]) if test x"$XKB" = "xyes"; then XKBPROTO_REQUIRES="kbproto" - PKG_CHECK_MODULES(XKBPROTO, kbproto inputproto) + X11_REQUIRES="${X11_REQUIRES} kbproto inputproto" AC_DEFINE(XKB,1,[Use XKB]) - X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS" - X11_LIBS="$X11_LIBS $XKBPROTO_LIBS" else XKBPROTO_REQUIRES="" fi @@ -376,14 +376,6 @@ fi dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([X11]) -LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}" - -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS" -fi X11_DATADIR="${datadir}/X11" AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data]) @@ -393,7 +385,8 @@ X11_LIBDIR="${libdir}/X11" AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) AC_SUBST(X11_LIBDIR) -X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XPROTO_CFLAGS" +PKG_CHECK_MODULES(X11, [$X11_REQUIRES]) +X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XTHREAD_CFLAGS" AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) |