[mapserver-commits] r12528 - trunk/mapserver/mapcache
svn at osgeo.org
svn at osgeo.org
Wed Sep 7 07:27:30 EDT 2011
Author: tbonfort
Date: 2011-09-07 04:27:30 -0700 (Wed, 07 Sep 2011)
New Revision: 12528
Modified:
trunk/mapserver/mapcache/configure
trunk/mapserver/mapcache/configure.in
Log:
check for pixman version >= 0.13.2
Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure 2011-09-06 21:01:22 UTC (rev 12527)
+++ trunk/mapserver/mapcache/configure 2011-09-07 11:27:30 UTC (rev 12528)
@@ -4602,15 +4602,19 @@
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pixman" >&5
+$as_echo_n "checking for Pixman... " >&6; }
if test "$with_pixman" = "no" -o "$with_pixman" = "" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
PIXMAN_CONFIG="no"
else
if test -z "$PKGCONFIG"; then
as_fn_error $? "pixman support requested, but pkg-config not found/configured" "$LINENO" 5
fi
if test "$with_pixman" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: searching default locations" >&5
+$as_echo "searching default locations" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pixman pkg-config entry" >&5
$as_echo_n "checking for pixman pkg-config entry... " >&6; }
`$PKGCONFIG --silence-errors -- pixman >> /dev/null`
@@ -4629,7 +4633,14 @@
fi
fi
else
- PIXMAN_CONFIG=$with_pixman
+ `$PKGCONFIG $with_pixman`
+ if test $? -eq 0 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using supplied pkg-config definition $with_pixman" >&5
+$as_echo "using supplied pkg-config definition $with_pixman" >&6; }
+ PIXMAN_CONFIG=$with_pixman
+ else
+ as_fn_error $? "failed to use $with_pixman" "$LINENO" 5
+ fi
fi
fi
@@ -4642,9 +4653,25 @@
PIXMAN_INC=
PIXMAN_LIB=
else
- PIXMAN_ENABLED="-DUSE_PIXMAN"
- PIXMAN_LIB=`$PKGCONFIG --libs $PIXMAN_CONFIG`
- PIXMAN_INC=`$PKGCONFIG --cflags $PIXMAN_CONFIG`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if pixman version is >= 0.13.2" >&5
+$as_echo_n "checking if pixman version is >= 0.13.2... " >&6; }
+ PIXMAN_VERSION=`$PKGCONFIG --modversion -- "$PIXMAN_CONFIG"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PIXMAN_VERSION" >&5
+$as_echo "$PIXMAN_VERSION" >&6; }
+ `$PKGCONFIG --silence-errors -- "$PIXMAN_CONFIG >= 0.13.2" >> /dev/null`
+ if test $? -eq 0 ; then
+ PIXMAN_ENABLED="-DUSE_PIXMAN"
+ PIXMAN_LIB=`$PKGCONFIG --libs $PIXMAN_CONFIG`
+ PIXMAN_INC=`$PKGCONFIG --cflags $PIXMAN_CONFIG`
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pixman support has been disabled because your version is too old.
+ full WMS will use the internal (usually slower) image merging functions" >&5
+$as_echo "$as_me: WARNING: pixman support has been disabled because your version is too old.
+ full WMS will use the internal (usually slower) image merging functions" >&2;}
+ PIXMAN_ENABLED=
+ PIXMAN_INC=
+ PIXMAN_LIB=
+ fi
fi
PIXMAN_ENABLED=$PIXMAN_ENABLED
@@ -5107,8 +5134,8 @@
$as_echo_n "checking for gdal-config usability in $with_gdal... " >&6; }
if test -x "$with_gdal"; then
GDALCONFIG=$with_gdal
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
else
as_fn_error $? "$with_gdal not found or not executable" "$LINENO" 5
fi
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-09-06 21:01:22 UTC (rev 12527)
+++ trunk/mapserver/mapcache/configure.in 2011-09-07 11:27:30 UTC (rev 12528)
@@ -195,14 +195,16 @@
,
[with_pixman=yes])
+ AC_MSG_CHECKING(for Pixman)
if test "$with_pixman" = "no" -o "$with_pixman" = "" ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(disabled)
PIXMAN_CONFIG="no"
else
if test -z "$PKGCONFIG"; then
AC_MSG_ERROR([pixman support requested, but pkg-config not found/configured])
fi
if test "$with_pixman" = "yes" ; then
+ AC_MSG_RESULT(searching default locations)
AC_MSG_CHECKING(for pixman pkg-config entry)
`$PKGCONFIG --silence-errors -- pixman >> /dev/null`
if test $? -eq 0 ; then
@@ -218,7 +220,13 @@
fi
fi
else
- PIXMAN_CONFIG=$with_pixman
+ `$PKGCONFIG $with_pixman`
+ if test $? -eq 0 ; then
+ AC_MSG_RESULT([using supplied pkg-config definition $with_pixman])
+ PIXMAN_CONFIG=$with_pixman
+ else
+ AC_MSG_ERROR([failed to use $with_pixman])
+ fi
fi
fi
@@ -229,9 +237,21 @@
PIXMAN_INC=
PIXMAN_LIB=
else
- PIXMAN_ENABLED="-DUSE_PIXMAN"
- PIXMAN_LIB=`$PKGCONFIG --libs $PIXMAN_CONFIG`
- PIXMAN_INC=`$PKGCONFIG --cflags $PIXMAN_CONFIG`
+ AC_MSG_CHECKING([if pixman version is >= 0.13.2])
+ PIXMAN_VERSION=`$PKGCONFIG --modversion -- "$PIXMAN_CONFIG"`
+ AC_MSG_RESULT([$PIXMAN_VERSION])
+ `$PKGCONFIG --silence-errors -- "$PIXMAN_CONFIG >= 0.13.2" >> /dev/null`
+ if test $? -eq 0 ; then
+ PIXMAN_ENABLED="-DUSE_PIXMAN"
+ PIXMAN_LIB=`$PKGCONFIG --libs $PIXMAN_CONFIG`
+ PIXMAN_INC=`$PKGCONFIG --cflags $PIXMAN_CONFIG`
+ else
+ AC_MSG_WARN([pixman support has been disabled because your version is too old.
+ full WMS will use the internal (usually slower) image merging functions])
+ PIXMAN_ENABLED=
+ PIXMAN_INC=
+ PIXMAN_LIB=
+ fi
fi
AC_SUBST(PIXMAN_ENABLED,$PIXMAN_ENABLED)
AC_SUBST(PIXMAN_INC,$PIXMAN_INC)
@@ -491,7 +511,7 @@
AC_MSG_CHECKING(for gdal-config usability in $with_gdal)
if test -x "$with_gdal"; then
GDALCONFIG=$with_gdal
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(ok)
else
AC_MSG_ERROR($with_gdal not found or not executable)
fi
More information about the mapserver-commits
mailing list