[mapserver-commits] r12685 - trunk/mapserver/mapcache
svn at osgeo.org
svn at osgeo.org
Fri Oct 21 13:31:11 EDT 2011
Author: tbonfort
Date: 2011-10-21 10:31:11 -0700 (Fri, 21 Oct 2011)
New Revision: 12685
Modified:
trunk/mapserver/mapcache/Makefile.inc.in
trunk/mapserver/mapcache/configure
trunk/mapserver/mapcache/configure.in
Log:
minor additional linking tests, remove the THREADED_MPM define.
Modified: trunk/mapserver/mapcache/Makefile.inc.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.inc.in 2011-10-21 12:05:47 UTC (rev 12684)
+++ trunk/mapserver/mapcache/Makefile.inc.in 2011-10-21 17:31:11 UTC (rev 12685)
@@ -64,12 +64,12 @@
MAPSERVER_LIB=@MAPSERVER_LIB@
MAPSERVER_ENABLED=@MAPSERVER_ENABLED@
-ifeq ($(HTTPD),)
-THREADED_MPM=0
-else
-THREADED_MPM=$(shell $(HTTPD) -V | grep "Server MPM" | grep -q "Prefork"; echo $$?)
-endif
-MISC_ENABLED=@MISC_ENABLED@ -DTHREADED_MPM=$(THREADED_MPM)
+#ifeq ($(HTTPD),)
+#THREADED_MPM=0
+#else
+#THREADED_MPM=$(shell $(HTTPD) -V | grep "Server MPM" | grep -q "Prefork"; echo $$?)
+#endif
+#MISC_ENABLED=@MISC_ENABLED@ -DTHREADED_MPM=$(THREADED_MPM)
ALL_ENABLED=$(MISC_ENABLED) $(MEMCACHE_ENABLED) $(PCRE_ENABLED) $(OGR_ENABLED) $(GEOS_ENABLED) $(SQLITE_ENABLED) $(PIXMAN_ENABLED) $(TIFF_ENABLED) $(GEOTIFF_ENABLED) $(MAPSERVER_ENABLED)
Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure 2011-10-21 12:05:47 UTC (rev 12684)
+++ trunk/mapserver/mapcache/configure 2011-10-21 17:31:11 UTC (rev 12685)
@@ -4965,6 +4965,53 @@
if test -n "$TIFF_LIBDIR" ; then
TIFF_LIB="-L$TIFF_LIBDIR -ltiff"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadScanline in -ltiff" >&5
+$as_echo_n "checking for TIFFReadScanline in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFReadScanline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff "$TIFF_LIB" $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFReadScanline ();
+int
+main ()
+{
+return TIFFReadScanline ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tiff_TIFFReadScanline=yes
+else
+ ac_cv_lib_tiff_TIFFReadScanline=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFReadScanline" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFReadScanline" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTIFF 1
+_ACEOF
+
+ LIBS="-ltiff $LIBS"
+
+else
+ as_fn_error $? "failed to link against libtiff" "$LINENO" 5
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using libtiff from $TIFF_LIB" >&5
$as_echo " using libtiff from $TIFF_LIB" >&6; }
else
@@ -5165,6 +5212,53 @@
elif test "$with_geotiff" != "no" ; then
GEOTIFF_LIB="-L$with_geotiff/lib -lgeotiff"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTIFFClientOpen in -lgeotiff" >&5
+$as_echo_n "checking for XTIFFClientOpen in -lgeotiff... " >&6; }
+if ${ac_cv_lib_geotiff_XTIFFClientOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgeotiff "$GEOTIFF_LIB" $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XTIFFClientOpen ();
+int
+main ()
+{
+return XTIFFClientOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_geotiff_XTIFFClientOpen=yes
+else
+ ac_cv_lib_geotiff_XTIFFClientOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geotiff_XTIFFClientOpen" >&5
+$as_echo "$ac_cv_lib_geotiff_XTIFFClientOpen" >&6; }
+if test "x$ac_cv_lib_geotiff_XTIFFClientOpen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGEOTIFF 1
+_ACEOF
+
+ LIBS="-lgeotiff $LIBS"
+
+else
+ as_fn_error $? "failed to link with libgeotiff. Specify path" "$LINENO" 5
+fi
+
if test -r $with_geotiff/include/geotiff.h ; then
GEOTIFF_INC="-I$with_geotiff/include"
echo "using system libgeotiff from $with_geotiff/include/."
@@ -5347,8 +5441,8 @@
GDALCONFIG=""
if test "$with_gdal" = "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gdal support disabled by request: advanced seeding options will not be available\"" >&5
-$as_echo "$as_me: WARNING: \"gdal support disabled by request: advanced seeding options will not be available\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gdal support disabled by request: advanced seeding options will not be available" >&5
+$as_echo "$as_me: WARNING: gdal support disabled by request: advanced seeding options will not be available" >&2;}
else
if test "$with_gdal" = "yes"; then
# Extract the first word of "gdal-config", so it can be a program name with args.
@@ -5432,9 +5526,14 @@
fi
GEOSCONFIG=""
+ if test -z "$OGR_ENABLED"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: geos support disabled as gdal/ogr support was disabled/not found" >&5
+$as_echo "$as_me: WARNING: geos support disabled as gdal/ogr support was disabled/not found" >&2;}
+ fi
+
if test "$with_geos" = "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"geos support disabled by request: advanced seeding options will not be available\"" >&5
-$as_echo "$as_me: WARNING: \"geos support disabled by request: advanced seeding options will not be available\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: geos support disabled by request: advanced seeding options will not be available" >&5
+$as_echo "$as_me: WARNING: geos support disabled by request: advanced seeding options will not be available" >&2;}
else
if test "$with_geos" = "yes"; then
# Extract the first word of "geos-config", so it can be a program name with args.
@@ -5491,7 +5590,49 @@
if test -n "$GEOSCONFIG"; then
GEOS_CFLAGS=`$GEOSCONFIG --cflags`
GEOS_LIBS="`$GEOSCONFIG --ldflags` -lgeos_c"
- GEOS_ENABLED="-DUSE_GEOS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOSPreparedIntersects in -lgeos_c" >&5
+$as_echo_n "checking for GEOSPreparedIntersects in -lgeos_c... " >&6; }
+if ${ac_cv_lib_geos_c_GEOSPreparedIntersects+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgeos_c "$GEOS_LIBS" $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char GEOSPreparedIntersects ();
+int
+main ()
+{
+return GEOSPreparedIntersects ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_geos_c_GEOSPreparedIntersects=yes
+else
+ ac_cv_lib_geos_c_GEOSPreparedIntersects=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geos_c_GEOSPreparedIntersects" >&5
+$as_echo "$ac_cv_lib_geos_c_GEOSPreparedIntersects" >&6; }
+if test "x$ac_cv_lib_geos_c_GEOSPreparedIntersects" = xyes; then :
+ GEOS_ENABLED="-DUSE_GEOS"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Geos support disabled as installed version is too old" >&5
+$as_echo "$as_me: WARNING: Geos support disabled as installed version is too old" >&2;}
+fi
+
fi
fi
GEOS_ENABLED=$GEOS_ENABLED
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-10-21 12:05:47 UTC (rev 12684)
+++ trunk/mapserver/mapcache/configure.in 2011-10-21 17:31:11 UTC (rev 12685)
@@ -504,7 +504,7 @@
)
GDALCONFIG=""
if test "$with_gdal" = "no"; then
- AC_MSG_WARN("gdal support disabled by request: advanced seeding options will not be available")
+ AC_MSG_WARN([gdal support disabled by request: advanced seeding options will not be available])
else
if test "$with_gdal" = "yes"; then
AC_PATH_PROG(GDALCONFIG, gdal-config)
@@ -541,8 +541,12 @@
[with_geos=yes]
)
GEOSCONFIG=""
+ if test -z "$OGR_ENABLED"; then
+ AC_MSG_WARN([geos support disabled as gdal/ogr support was disabled/not found])
+ fi
+
if test "$with_geos" = "no"; then
- AC_MSG_WARN("geos support disabled by request: advanced seeding options will not be available")
+ AC_MSG_WARN([geos support disabled by request: advanced seeding options will not be available])
else
if test "$with_geos" = "yes"; then
AC_PATH_PROG(GEOSCONFIG, geos-config)
@@ -558,7 +562,9 @@
if test -n "$GEOSCONFIG"; then
GEOS_CFLAGS=`$GEOSCONFIG --cflags`
GEOS_LIBS="`$GEOSCONFIG --ldflags` -lgeos_c"
- GEOS_ENABLED="-DUSE_GEOS"
+ AC_CHECK_LIB(geos_c, GEOSPreparedIntersects, GEOS_ENABLED="-DUSE_GEOS",
+ AC_MSG_WARN([Geos support disabled as installed version is too old]),
+ "$GEOS_LIBS")
fi
fi
AC_SUBST(GEOS_ENABLED,$GEOS_ENABLED)
@@ -620,7 +626,8 @@
GEOTIFF_ENABLED=""
AC_DEFUN([GEOTIFF_CHECK],[
AC_ARG_WITH(geotiff,
- [ --with-geotiff=ARG Libgeotiff library to use (ARG=yes or path)],,[with_geotiff=no])
+ [ --with-geotiff=ARG Libgeotiff library to use (ARG=yes or path)],
+ ,[with_geotiff=no])
if test "$with_geotiff" = "yes" -o "$with_geotiff" = "" ; then
@@ -652,6 +659,9 @@
elif test "$with_geotiff" != "no" ; then
GEOTIFF_LIB="-L$with_geotiff/lib -lgeotiff"
+ AC_CHECK_LIB(geotiff,XTIFFClientOpen,,
+ AC_MSG_ERROR([failed to link with libgeotiff. Specify path]),
+ "$GEOTIFF_LIB")
if test -r $with_geotiff/include/geotiff.h ; then
GEOTIFF_INC="-I$with_geotiff/include"
echo "using system libgeotiff from $with_geotiff/include/."
@@ -693,6 +703,9 @@
if test -n "$TIFF_LIBDIR" ; then
TIFF_LIB="-L$TIFF_LIBDIR -ltiff"
+ AC_CHECK_LIB(tiff, TIFFReadScanline,,
+ AC_MSG_ERROR([failed to link against libtiff]),
+ "$TIFF_LIB")
AC_MSG_RESULT([ using libtiff from $TIFF_LIB])
else
AC_MSG_WARN([cannot find tiff lib in $TIFF_DIR])
More information about the mapserver-commits
mailing list