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 /libXpm/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 'libXpm/configure.ac')
| -rw-r--r-- | libXpm/configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libXpm/configure.ac b/libXpm/configure.ac index ba7e3b484..46e2a2776 100644 --- a/libXpm/configure.ac +++ b/libXpm/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXpm], [3.5.10], +AC_INIT([libXpm], [3.5.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXpm]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([m4]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL @@ -25,7 +24,8 @@ AC_CHECK_FUNCS([strlcat]) # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XPM, xproto x11) -PKG_CHECK_MODULES(SXPM, x11 xt xext xextproto, build_sxpm=true, build_sxpm=false) +PKG_CHECK_MODULES(SXPM, [x11 xt xext xextproto xproto >= 7.0.17], + [build_sxpm=true], [build_sxpm=false]) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) # Internationalization & localization support @@ -58,6 +58,15 @@ if test x$STAT_ZFILE = xyes ; then AC_DEFINE(STAT_ZFILE, 1, [Define to 1 to automatically look for files with .Z & .gz extensions]) fi + +case $host_os in + *mingw*) + AC_DEFINE(NO_ZPIPE, 1, [Define to 1 to disable decompression via pipes]) + ;; + *) + ;; +esac + AC_CONFIG_FILES([Makefile doc/Makefile include/Makefile |