aboutsummaryrefslogtreecommitdiff
path: root/libXpm/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-01 12:23:16 +0200
committermarha <marha@users.sourceforge.net>2013-10-01 12:28:08 +0200
commit6dd755aa923291db2501cc5c22e409c41a70e3c1 (patch)
treefa88a321afc13657f7687a25d466f49151c9599a /libXpm/configure.ac
parenta5391fdea94a7b827069c6f926f83a235076ccb4 (diff)
downloadvcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.tar.gz
vcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.tar.bz2
vcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.zip
Update following packages:
libXpm-3.5.11 libXaw-1.0.12 libXfont-1.4.6 libXrender-0.9.8 xproto-7.0.24 inputproto-2.3 xclock-1.0.7 xhost-1.0.6
Diffstat (limited to 'libXpm/configure.ac')
-rw-r--r--libXpm/configure.ac15
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