diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
| commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
| tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /libXau/configure.ac | |
| parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'libXau/configure.ac')
| -rw-r--r-- | libXau/configure.ac | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libXau/configure.ac b/libXau/configure.ac index 9e1b2a50a..c63adcbee 100644 --- a/libXau/configure.ac +++ b/libXau/configure.ac @@ -24,15 +24,15 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXau, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau) +AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# 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) AC_PROG_CC AC_PROG_INSTALL @@ -40,14 +40,13 @@ AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_PROG_MAKE_SET +XORG_CWARNFLAGS PKG_CHECK_MODULES(XAU, xproto) +XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS" AC_SUBST(XAU_CFLAGS) AC_SUBST(XAU_LIBS) -kerberos=false -AM_CONDITIONAL(KERBEROS, test x$kerberos = xtrue) - AC_ARG_ENABLE(xthreads, AC_HELP_STRING([--disable-xthreads], [Disable libXau support for Multithreading]), @@ -77,15 +76,9 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xau]) LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}" -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - XAU_CFLAGS="$GCC_WARNINGS $XAU_CFLAGS" -fi - XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xau.pc]) |