[mapserver-commits] r12866 - in trunk/mapserver: . mapscript/php
svn at osgeo.org
svn at osgeo.org
Wed Dec 7 11:24:26 EST 2011
Author: aboudreault
Date: 2011-12-07 08:24:26 -0800 (Wed, 07 Dec 2011)
New Revision: 12866
Modified:
trunk/mapserver/configure
trunk/mapserver/mapscript/php/mapscript_error.c
trunk/mapserver/mapscript/php/php_mapscript.c
trunk/mapserver/mapscript/php/php_mapscript.h
trunk/mapserver/mapscript/php/php_mapscript_util.c
trunk/mapserver/mapscript/php/php_regex.c
Log:
regenerated configure script with autoconf2.59 and fixed some include path issue in php mapscript
Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/configure 2011-12-07 16:24:26 UTC (rev 12866)
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION PKG_CONFIG FT_BIN FT_ENABLED FT_INC FT_LIB ZLIB_ENABLED ZLIB_INC ZLIB_LIB PNG_ENABLED PNG_INC PNG_LIB GIF_ENABLED GIF_INC GIF_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN FTGL_ENABLED FTGL_INC FTGL_LIB OGL_ENABLED OGL_INC OGL_LIB AGG_LIB AGG_INC AGG_OBJ PROJ_ENABLED PROJ_INC PROJ_LIBS THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_EN
ABLED OGR_ENABLED GDAL_INC GDAL_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYSQL_ENABLED MYSQL_INC MYSQL_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG CURL_INC CURL_LIB EXEMPI_ENABLED EXEMPI_INC EXEMPI_LIB LIBXML2_CONFIG XML2_INC XML2_LIB WMS_LYR_ENABLED WFS_LYR_ENABLED SOS_SVR_ENABLED XSLT_ENABLED XSLT_INC XSLT_LIB EXSLT_ENABLED EXSLT_INC EXSLT_LIB FRIBIDI_CONFIG FRIBIDI_ENABLED FRIBIDI_INC FRIBIDI_LIB CAIRO_ENABLED CAIRO_INC CAIRO_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M USE_NINT DEBUG_FLAGS LD_SHARED SO_EXT SO_COMMAND_NAME PHP_LD_SHARED PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC OS_INCLUDE_DIR ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION PKG_CONFIG FT_BIN FT_ENABLED FT_INC FT_LIB ZLIB_ENABLED ZLIB_INC ZLIB_LIB PNG_ENABLED PNG_INC PNG_LIB GIF_ENABLED GIF_INC GIF_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN FTGL_ENABLED FTGL_INC FTGL_LIB OGL_ENABLED OGL_INC OGL_LIB AGG_LIB AGG_INC AGG_OBJ PROJ_ENABLED PROJ_INC PROJ_LIBS THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_EN
ABLED OGR_ENABLED GDAL_INC GDAL_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYSQL_ENABLED MYSQL_INC MYSQL_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG CURL_INC CURL_LIB EXEMPI_ENABLED EXEMPI_INC EXEMPI_LIB LIBXML2_CONFIG XML2_INC XML2_LIB WMS_LYR_ENABLED WFS_LYR_ENABLED SOS_SVR_ENABLED XSLT_ENABLED XSLT_INC XSLT_LIB EXSLT_ENABLED EXSLT_INC EXSLT_LIB FRIBIDI_CONFIG FRIBIDI_ENABLED FRIBIDI_INC FRIBIDI_LIB CAIRO_ENABLED CAIRO_INC CAIRO_LIB LIBSVG_CAIRO_ENABLED LIBSVG_CAIRO_INC LIBSVG_CAIRO_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M USE_NINT DEBUG_FLAGS LD_SHARED SO_EXT SO_COMMAND_NAME PHP_LD_SHARED PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC OS_INCLUDE_DIR ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -935,6 +935,7 @@
Include FriBidi Support (ARG=yes/path to
fribidi-config or fribidi.pc)
--with-cairo[=ARG] Include Cairo Support (ARG=yes/path to cairo.pc)
+ --with-libsvg-cairo[=ARG] Include Cairo SVG Parser Support (ARG=yes/path to cairo.pc)
--with-fastcgi=path Enable FastCGI, point to installed tree.
--with-httpd Specify path to 'httpd' executable.
--with-warnings[=flags] Enable strict warnings (or user defined warnings)
@@ -13471,7 +13472,7 @@
{ (exit 1); exit 1; }; }
fi
else
- CAIRO_CONFIG=$with_cairo_config
+ CAIRO_CONFIG=$with_cairo
fi
if test "$CAIRO_CONFIG" = "no" ; then
@@ -13498,6 +13499,83 @@
ALL_LIB="$CAIRO_LIB $ALL_LIB"
+
+echo "$as_me:$LINENO: checking if Cairo svg parser support requested" >&5
+echo $ECHO_N "checking if Cairo svg parser support requested... $ECHO_C" >&6
+
+LIBSVG_CAIRO_ENABLED=$LIBSVG_CAIRO_ENABLED
+
+LIBSVG_CAIRO_INC=$LIBSVG_CAIRO_INC
+
+LIBSVG_CAIRO_LIB=$LIBSVG_CAIRO_LIB
+
+
+
+# Check whether --with-libsvg-cairo or --without-libsvg-cairo was given.
+if test "${with_libsvg_cairo+set}" = set; then
+ withval="$with_libsvg_cairo"
+
+fi;
+
+if test "$with_libsvg_cairo" = "no" -o "$with_libsvg_cairo" = "" ; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ LIBSVG_CAIRO_CONFIG="no"
+
+elif test "$with_libsvg_cairo" = "yes" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ if test "$PKG_CONFIG" != "no" ; then
+ echo "$as_me:$LINENO: checking for libsvg-cairo pkg-config path" >&5
+echo $ECHO_N "checking for libsvg-cairo pkg-config path... $ECHO_C" >&6
+ `$PKG_CONFIG --silence-errors -- libsvg-cairo >> /dev/null`
+ if test $? -eq 0 ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ LIBSVG_CAIRO_CONFIG="libsvg-cairo"
+ else
+ { { echo "$as_me:$LINENO: error: libsvg-cairo support requested, but not found." >&5
+echo "$as_me: error: libsvg-cairo support requested, but not found." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ else
+ { { echo "$as_me:$LINENO: error: pkg-config required for libsvg-cairo support, try using --with-pkg-config=PATH" >&5
+echo "$as_me: error: pkg-config required for libsvg-cairo support, try using --with-pkg-config=PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+else
+ LIBSVG_CAIRO_CONFIG=$with_libsvg_cairo
+fi
+
+if test "$LIBSVG_CAIRO_CONFIG" = "no" ; then
+ LIBSVG_CAIRO_ENABLED=
+ LIBSVG_CAIRO_INC=
+ LIBSVG_CAIRO_LIB=
+else
+ if test -z "$CAIRO_ENABLED"; then
+ { { echo "$as_me:$LINENO: error: libsvg-cairo support requires cairo support. (hint: rerun with --with-cairo)" >&5
+echo "$as_me: error: libsvg-cairo support requires cairo support. (hint: rerun with --with-cairo)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ echo "$as_me:$LINENO: result: yes, pkg-config defaults, or user supplied path to cairo.pc" >&5
+echo "${ECHO_T}yes, pkg-config defaults, or user supplied path to cairo.pc" >&6
+ LIBSVG_CAIRO_ENABLED="-DUSE_SVG_CAIRO"
+ LIBSVG_CAIRO_LIB=`$PKG_CONFIG --libs $LIBSVG_CAIRO_CONFIG`
+ LIBSVG_CAIRO_INC=`$PKG_CONFIG --cflags $LIBSVG_CAIRO_CONFIG`
+fi
+
+LIBSVG_CAIRO_ENABLED=$LIBSVG_CAIRO_ENABLED
+
+LIBSVG_CAIRO_INC=$LIBSVG_CAIRO_INC
+
+LIBSVG_CAIRO_LIB=$LIBSVG_CAIRO_LIB
+
+
+ALL_ENABLED="$LIBSVG_CAIRO_ENABLED $ALL_ENABLED"
+ALL_INC="$LIBSVG_CAIRO_INC $ALL_INC"
+ALL_LIB="$LIBSVG_CAIRO_LIB $ALL_LIB"
+
+
echo "$as_me:$LINENO: checking FastCGI support" >&5
echo $ECHO_N "checking FastCGI support... $ECHO_C" >&6
@@ -15370,6 +15448,9 @@
s, at CAIRO_ENABLED@,$CAIRO_ENABLED,;t t
s, at CAIRO_INC@,$CAIRO_INC,;t t
s, at CAIRO_LIB@,$CAIRO_LIB,;t t
+s, at LIBSVG_CAIRO_ENABLED@,$LIBSVG_CAIRO_ENABLED,;t t
+s, at LIBSVG_CAIRO_INC@,$LIBSVG_CAIRO_INC,;t t
+s, at LIBSVG_CAIRO_LIB@,$LIBSVG_CAIRO_LIB,;t t
s, at FASTCGI_ENABLED@,$FASTCGI_ENABLED,;t t
s, at FASTCGI_INC@,$FASTCGI_INC,;t t
s, at FASTCGI_LIB@,$FASTCGI_LIB,;t t
@@ -15708,6 +15789,8 @@
echo "${ECHO_T} SVG Symbol support: ${AGG_SVG_SYMBOLS_ENABLED}" >&6
echo "$as_me:$LINENO: result: Cairo (SVG,PDF) support: ${CAIRO_ENABLED}" >&5
echo "${ECHO_T} Cairo (SVG,PDF) support: ${CAIRO_ENABLED}" >&6
+echo "$as_me:$LINENO: result: Cairo SVG parser support: ${LIBSVG_CAIRO_ENABLED}" >&5
+echo "${ECHO_T} Cairo SVG parser support: ${LIBSVG_CAIRO_ENABLED}" >&6
echo "$as_me:$LINENO: result: KML support: ${KML_ENABLED}" >&5
echo "${ECHO_T} KML support: ${KML_ENABLED}" >&6
echo "$as_me:$LINENO: result: " >&5
Modified: trunk/mapserver/mapscript/php/mapscript_error.c
===================================================================
--- trunk/mapserver/mapscript/php/mapscript_error.c 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/mapscript/php/mapscript_error.c 2011-12-07 16:24:26 UTC (rev 12866)
@@ -33,7 +33,7 @@
#include "zend_exceptions.h"
#include "php_mapscript_util.h"
#include <stdarg.h>
-#include "maperror.h"
+#include "../../maperror.h"
#define MAX_EXCEPTION_MSG 256
Modified: trunk/mapserver/mapscript/php/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.c 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/mapscript/php/php_mapscript.c 2011-12-07 16:24:26 UTC (rev 12866)
@@ -37,7 +37,7 @@
#include "ext/standard/info.h"
#include "ext/standard/head.h"
-#include "maperror.h"
+#include "../../maperror.h"
#include <time.h>
Modified: trunk/mapserver/mapscript/php/php_mapscript.h
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.h 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/mapscript/php/php_mapscript.h 2011-12-07 16:24:26 UTC (rev 12866)
@@ -50,13 +50,13 @@
#include <unistd.h>
#endif
-#include "mapserver.h"
-#include "mapregex.h"
+#include "../../mapserver.h"
+#include "../../mapregex.h"
#endif /* USE_PHP_REGEX */
-#include "maptemplate.h"
-#include "mapogcsld.h"
+#include "../../maptemplate.h"
+#include "../../mapogcsld.h"
#define MAPSCRIPT_VERSION "($Revision$ $Date$)"
Modified: trunk/mapserver/mapscript/php/php_mapscript_util.c
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript_util.c 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/mapscript/php/php_mapscript_util.c 2011-12-07 16:24:26 UTC (rev 12866)
@@ -29,7 +29,7 @@
#include "php_mapscript_util.h"
-#include "maperror.h"
+#include "../../maperror.h"
zend_object_value mapscript_object_new(zend_object *zobj,
Modified: trunk/mapserver/mapscript/php/php_regex.c
===================================================================
--- trunk/mapserver/mapscript/php/php_regex.c 2011-12-07 15:20:11 UTC (rev 12865)
+++ trunk/mapserver/mapscript/php/php_regex.c 2011-12-07 16:24:26 UTC (rev 12866)
@@ -52,7 +52,7 @@
doesn't #define away our ms_*/
#define BUILDING_REGEX_PROXY 1
-#include "mapregex.h"
+#include "../../mapregex.h"
/* regex_extra.h doesn't exist in PHP >=5.3 */
#include "php.h"
More information about the mapserver-commits
mailing list