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 /libXaw/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 'libXaw/configure.ac')
-rw-r--r-- | libXaw/configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libXaw/configure.ac b/libXaw/configure.ac index 3ed625e7d..1cbe86646 100644 --- a/libXaw/configure.ac +++ b/libXaw/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXaw], [1.0.11], +AC_INIT([libXaw], [1.0.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -98,6 +98,15 @@ AC_CHECK_HEADERS([wctype.h wchar.h widec.h]) # Checks for functions AC_CHECK_FUNCS([iswalnum getpagesize]) +# Link with winsock if mingw target +case $host_os in + *mingw*) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) + ;; +esac + AC_CONFIG_FILES([Makefile include/Makefile man/Makefile |