[mapserver-commits] r12181 - trunk/mapserver/mapcache
svn at osgeo.org
svn at osgeo.org
Fri Aug 26 07:04:58 EDT 2011
Author: tbonfort
Date: 2011-08-26 04:04:58 -0700 (Fri, 26 Aug 2011)
New Revision: 12181
Modified:
trunk/mapserver/mapcache/configure
trunk/mapserver/mapcache/configure.in
Log:
remove unused and unimplemented option for global lock
thomas.bonfort | 2010-12-17 11:10:53 +0100 (Fri, 17 Dec 2010)
Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure 2011-08-26 11:04:53 UTC (rev 12180)
+++ trunk/mapserver/mapcache/configure 2011-08-26 11:04:58 UTC (rev 12181)
@@ -753,7 +753,7 @@
GDAL_LIB
GDAL_INC
GDAL_ENABLED
-GDAL_CONFIG
+GDALCONFIG
JPEG_LIB
JPEG_INC
PNG_LIB
@@ -1509,7 +1509,7 @@
--with-apr-config path to apr-config program
--with-png=DIR Specify where PNG is installed
--with-jpeg=DIR Specify where JPEG is installed
- --with-gdal[=PATH] Include GDAL support (PATH is path to gdal-config)
+ --with-gdal path to gdal-config program
--with-xml2-config=/path/to/xml2-config xml2-config tool location
--with-curl-config path to curl-config program
@@ -10325,12 +10325,6 @@
-
-
-
-
-
-
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
@@ -11050,36 +11044,31 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GDAL support requested" >&5
-$as_echo_n "checking if GDAL support requested... " >&6; }
-
# Check whether --with-gdal was given.
if test "${with_gdal+set}" = set; then :
withval=$with_gdal;
+else
+ with_gdal=yes
+
fi
-
-if test "$with_gdal" = "yes" ; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- if test "`basename xx/$with_gdal`" = "gdal-config" ; then
- GDAL_CONFIG="$with_gdal"
- fi
-
- if test -z "$GDAL_CONFIG" ; then
- # Extract the first word of "gdal-config", so it can be a program name with args.
+ GDALCONFIG=""
+ if test "$with_gdal" = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gdal support disabled by request\"" >&5
+$as_echo "$as_me: WARNING: \"gdal support disabled by request\"" >&2;}
+ else
+ if test "$with_gdal" = "yes"; then
+ # Extract the first word of "gdal-config", so it can be a program name with args.
set dummy gdal-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then :
+if test "${ac_cv_path_GDALCONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $GDAL_CONFIG in
+ case $GDALCONFIG in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GDAL_CONFIG="$GDAL_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_GDALCONFIG="$GDALCONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11089,7 +11078,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GDAL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GDALCONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -11097,76 +11086,48 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_GDAL_CONFIG" && ac_cv_path_GDAL_CONFIG="no"
;;
esac
fi
-GDAL_CONFIG=$ac_cv_path_GDAL_CONFIG
-if test -n "$GDAL_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5
-$as_echo "$GDAL_CONFIG" >&6; }
+GDALCONFIG=$ac_cv_path_GDALCONFIG
+if test -n "$GDALCONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDALCONFIG" >&5
+$as_echo "$GDALCONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdal-config usability in $with_gdal" >&5
+$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; }
+ else
+ as_fn_error $? "$with_gdal not found or not executable" "$LINENO" 5
+ fi
+ fi
+ if test -n "$GDALCONFIG"; then
+ GDAL_ENABLED="-DUSE_GDAL"
+ GDAL_CFLAGS=`$GDALCONFIG --cflags --includes`
+ GDAL_LIBS=`$GDALCONFIG --libs`
+ fi
fi
+ GDAL_ENABLED=$GDAL_ENABLED
- if test "$GDAL_CONFIG" = "no" ; then
- as_fn_error $? "couldn't find gdal-config" "$LINENO" 5
- fi
+ GDAL_INC=$GDAL_CFLAGS
- GDAL_ENABLED=-DUSE_GDAL
+ GDAL_LIB=$GDAL_LIBS
-elif test -n "$with_gdal" -a "$with_gdal" != "no" ; then
- GDAL_CONFIG=$with_gdal
- if test -f "$GDAL_CONFIG" -a -x "$GDAL_CONFIG" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied gdal-config ($GDAL_CONFIG)" >&5
-$as_echo "yes, user supplied gdal-config ($GDAL_CONFIG)" >&6; }
- else
- as_fn_error $? "'$GDAL_CONFIG' is not an executable. Make sure you use --with-gdal=/path/to/gdal-config" "$LINENO" 5
- fi
- GDAL_ENABLED=-DUSE_GDAL
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -n "$GDAL_ENABLED" -o "$OGR_ENABLED"; then
-
- GDAL_LIB=`$GDAL_CONFIG --libs`' '`$GDAL_CONFIG --dep-libs`
- GDAL_INC=`$GDAL_CONFIG --cflags`
-
-fi
-
-GDAL_ENABLED=$GDAL_ENABLED
-
-GDAL_INC=$GDAL_INC
-
-GDAL_LIB=$GDAL_LIB
-
-
-
-
-
-#PKGCONFIG_CHECK
-
-#CAIRO_CHECK
-
-#MERGE_CHECK
-
-
-
-
-
# Check whether --with-xml2-config was given.
if test "${with_xml2_config+set}" = set; then :
withval=$with_xml2_config;
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-08-26 11:04:53 UTC (rev 12180)
+++ trunk/mapserver/mapcache/configure.in 2011-08-26 11:04:58 UTC (rev 12181)
@@ -160,77 +160,6 @@
AC_SUBST(APR_LIBS,`$APRCONFIG --link-ld`)
])
-AC_DEFUN([PKGCONFIG_CHECK],[
- AC_SUBST(PKGCONFIG)
- AC_ARG_WITH(pkg-config,
- AC_HELP_STRING([--with-pkg-config[=PATH]],[path to pkg-config)]),
- ,
- [with_pkg_config=yes])
- if test "$with_pkg_config" = "no"; then
- AC_MSG_CHECKING(for pkg-config usability)
- AC_MSG_RESULT(disabled by request)
- else
- if test "$with_pkg_config" = "yes" ; then
- AC_PATH_PROG(PKGCONFIG, pkg-config)
- else
- AC_MSG_CHECKING(for pkg-config usability in $with_pkg_config)
- if test -x "$with_pkg_config"; then
- PKGCONFIG=$with_pkg_config
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR($with_pkg_config not found or not executable)
- fi
- fi
- if test -z "$PKGCONFIG"; then
- AC_MSG_ERROR(pkg-config utility not found. use --with-pkg-config to specify its location.)
- fi
- fi
- AC_SUBST(PKGCONFIG)
-])
-
-AC_DEFUN([CAIRO_CHECK],[
- AC_ARG_WITH(cairo,
- AC_HELP_STRING([--with-cairo[[=ARG]]],[Include Cairo Support (ARG=yes/no/path to cairo.pc)]),
- ,
- [with_cairo=yes])
-
- if test "$with_cairo" = "no" -o "$with_cairo" = "" ; then
- AC_MSG_RESULT(no)
- CAIRO_CONFIG="no"
- else
- if test -z "$PKGCONFIG"; then
- AC_MSG_ERROR([cairo support requested, but pkg-config not found/configured])
- fi
- if test "$with_cairo" = "yes" ; then
- AC_MSG_CHECKING(for cairo pkg-config entry)
- `$PKGCONFIG --silence-errors -- cairo cairo-png >> /dev/null`
- if test $? -eq 0 ; then
- AC_MSG_RESULT(found)
- CAIRO_CONFIG="cairo cairo-png"
- else
- AC_MSG_ERROR([cairo support requested, but not found.Try installing the cairo development headers])
- fi
- else
- CAIRO_CONFIG=$with_cairo_config
- fi
- fi
-
- if test "$CAIRO_CONFIG" = "no" ; then
- AC_MSG_WARN([cairo support has been disabled or could not be configured.
- Metatiling and tile merging cannot be enabled on the resulting build])
- CAIRO_ENABLED=
- CAIRO_INC=
- CAIRO_LIB=
- else
- CAIRO_ENABLED="-DUSE_CAIRO"
- CAIRO_LIB=`$PKGCONFIG --libs $CAIRO_CONFIG`
- CAIRO_INC=`$PKGCONFIG --cflags $CAIRO_CONFIG`
- fi
- AC_SUBST(CAIRO_ENABLED,$CAIRO_ENABLED)
- AC_SUBST(CAIRO_INC,$CAIRO_INC)
- AC_SUBST(CAIRO_LIB,$CAIRO_LIB)
-])
-
AC_DEFUN([DEBUG_CHECK],[
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],[Enable debug build]),
@@ -245,20 +174,6 @@
AC_SUBST(CFLAGS,$CFLAGS)
])
-AC_DEFUN([MERGE_CHECK],[
- AC_SUBST(MERGE_ENABLED)
- if test -n "$CAIRO_ENABLED"; then
- AC_ARG_ENABLE(tile-merging,
- AC_HELP_STRING([--enable-tile-merging],[Enable on-the-fly tile merging - requires cairo]),
- ,
- [enable_tile_merging=yes]
- )
- if test "$enable_tile_merging" == "yes"; then
- AC_SUBST(MERGE_ENABLED,"-DMERGE_ENABLED")
- fi
- fi
-])
-
AC_DEFUN(AC_EXPAND_PATH,[
if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
$2="$1"
@@ -267,6 +182,37 @@
fi
])
+AC_DEFUN([GDAL_CHECK],[
+ AC_ARG_WITH(gdal,
+ AC_HELP_STRING([--with-gdal], [path to gdal-config program]),
+ ,
+ [with_gdal=yes]
+ )
+ GDALCONFIG=""
+ if test "$with_gdal" = "no"; then
+ AC_MSG_WARN("gdal support disabled by request")
+ else
+ if test "$with_gdal" = "yes"; then
+ AC_PATH_PROG(GDALCONFIG, gdal-config)
+ else
+ AC_MSG_CHECKING(for gdal-config usability in $with_gdal)
+ if test -x "$with_gdal"; then
+ GDALCONFIG=$with_gdal
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_ERROR($with_gdal not found or not executable)
+ fi
+ fi
+ if test -n "$GDALCONFIG"; then
+ GDAL_ENABLED="-DUSE_GDAL"
+ GDAL_CFLAGS=`$GDALCONFIG --cflags --includes`
+ GDAL_LIBS=`$GDALCONFIG --libs`
+ fi
+ fi
+ AC_SUBST(GDAL_ENABLED,$GDAL_ENABLED)
+ AC_SUBST(GDAL_INC,$GDAL_CFLAGS)
+ AC_SUBST(GDAL_LIB,$GDAL_LIBS)
+])
AC_DEFUN(FASTCGI_CHECK,[
AC_ARG_WITH(fastcgi,
@@ -423,66 +369,6 @@
])
-AC_DEFUN(GDAL_CHECK,[
-AC_MSG_CHECKING(if GDAL support requested)
-
-AC_ARG_WITH(gdal,
-[ --with-gdal[[=PATH]] Include GDAL support (PATH is path to gdal-config)],,)
-
-if test "$with_gdal" = "yes" ; then
-
- AC_MSG_RESULT([yes])
-
- if test "`basename xx/$with_gdal`" = "gdal-config" ; then
- GDAL_CONFIG="$with_gdal"
- fi
-
- if test -z "$GDAL_CONFIG" ; then
- AC_PATH_PROG(GDAL_CONFIG, gdal-config, no)
- fi
-
- if test "$GDAL_CONFIG" = "no" ; then
- AC_MSG_ERROR([couldn't find gdal-config])
- fi
-
- GDAL_ENABLED=-DUSE_GDAL
-
-elif test -n "$with_gdal" -a "$with_gdal" != "no" ; then
-
- GDAL_CONFIG=$with_gdal
-
- if test -f "$GDAL_CONFIG" -a -x "$GDAL_CONFIG" ; then
- AC_MSG_RESULT([yes, user supplied gdal-config ($GDAL_CONFIG)])
- else
- AC_MSG_ERROR(['$GDAL_CONFIG' is not an executable. Make sure you use --with-gdal=/path/to/gdal-config])
- fi
-
- GDAL_ENABLED=-DUSE_GDAL
-
-else
-
- AC_MSG_RESULT([no])
-
-fi
-
-dnl
-dnl GDAL_LIB and GDAL_INC are used for both GDAL and OGR
-dnl
-
-if test -n "$GDAL_ENABLED" -o "$OGR_ENABLED"; then
-
- GDAL_LIB=`$GDAL_CONFIG --libs`' '`$GDAL_CONFIG --dep-libs`
- GDAL_INC=`$GDAL_CONFIG --cflags`
-
-fi
-
-AC_SUBST(GDAL_ENABLED,$GDAL_ENABLED)
-AC_SUBST(GDAL_INC, $GDAL_INC)
-AC_SUBST(GDAL_LIB, $GDAL_LIB)
-
-
-
-])
DEBUG_CHECK
AC_ARG_ENABLE(module,
@@ -525,12 +411,7 @@
JPEG_CHECK
GDAL_CHECK
-#PKGCONFIG_CHECK
-#CAIRO_CHECK
-
-#MERGE_CHECK
-
XML2_CHECK
CURL_CHECK
More information about the mapserver-commits
mailing list