diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /apps/xhost/configure.ac | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'apps/xhost/configure.ac')
| -rw-r--r-- | apps/xhost/configure.ac | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/xhost/configure.ac b/apps/xhost/configure.ac index 1b069e8c3..0d6f5061f 100644 --- a/apps/xhost/configure.ac +++ b/apps/xhost/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xhost], [1.0.5], +AC_INIT([xhost], [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xhost]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -17,11 +17,9 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_TYPE_SIGNAL - # Checks for pkg-config packages # - Both CFLAGS & LIBS needed: -PKG_CHECK_MODULES(XHOST, x11 xmuu) +PKG_CHECK_MODULES(XHOST, [xproto >= 7.0.22 x11 xmuu]) # - Only CFLAGS needed, not libs: PKG_CHECK_MODULES(XAU, xau) @@ -31,6 +29,15 @@ XTRANS_CONNECTION_FLAGS # Secure RPC detection macro from xtrans.m4 XTRANS_SECURE_RPC_FLAGS +# Link with winsock if mingw target +case $host_os in + *mingw*) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) + ;; +esac + AC_CONFIG_FILES([ Makefile man/Makefile]) |