diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
| commit | 82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch) | |
| tree | 52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /libXdmcp/configure.ac | |
| parent | f02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff) | |
| parent | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff) | |
| download | vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.gz vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.bz2 vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released
Diffstat (limited to 'libXdmcp/configure.ac')
| -rw-r--r-- | libXdmcp/configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac index 88d875485..9164231bb 100644 --- a/libXdmcp/configure.ac +++ b/libXdmcp/configure.ac @@ -24,15 +24,15 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXdmcp, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) +AC_INIT(libXdmcp, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) 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_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AC_PROG_CC AC_PROG_INSTALL @@ -46,6 +46,8 @@ AC_CHECK_FUNCS([srand48 lrand48]) AC_SEARCH_LIBS([recvfrom],[socket]) PKG_CHECK_MODULES(XDMCP, xproto) +XORG_DEFAULT_OPTIONS +XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS" AC_SUBST(XDMCP_CFLAGS) AC_SUBST(XDMCP_LIBS) @@ -62,7 +64,5 @@ dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile xdmcp.pc]) |