[mapguide-commits] r9172 - in sandbox/jng/clean_json: . Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-04-22 09:55:27 -0700 (Sat, 22 Apr 2017)
New Revision: 9172

Modified:
   sandbox/jng/clean_json/
   sandbox/jng/clean_json/Server/src/Core/Makefile.am
   sandbox/jng/clean_json/configure.in
Log:
Merged revision(s) 9162-9165 from trunk/MgDev:
Update configure.in to match new baseline version numbers
........
Update baseline FDO version
........



Property changes on: sandbox/jng/clean_json
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8818-9153
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/simplify:8814-9141
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8818-9153,9162-9165

Modified: sandbox/jng/clean_json/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/clean_json/Server/src/Core/Makefile.am	2017-04-22 16:27:24 UTC (rev 9171)
+++ sandbox/jng/clean_json/Server/src/Core/Makefile.am	2017-04-22 16:55:27 UTC (rev 9172)
@@ -98,7 +98,7 @@
   -ldwfcore \
   -ldwftk \
   -lexpat \
-  -lFDO-4.1.0 \
+  -lFDO-4.2.0 \
   -lExpressionEngine \
   -lxalanMsg \
   -lxalan-c \

Modified: sandbox/jng/clean_json/configure.in
===================================================================
--- sandbox/jng/clean_json/configure.in	2017-04-22 16:27:24 UTC (rev 9171)
+++ sandbox/jng/clean_json/configure.in	2017-04-22 16:55:27 UTC (rev 9172)
@@ -4,7 +4,7 @@
 # Variables
 # Following are the makefile directories
 #----------------------------------------------------------------------
-AC_INIT(mapguide,3.1.0,http://mapguide.osgeo.org)
+AC_INIT(mapguide,3.3.0,http://mapguide.osgeo.org)
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([1.9 tar-pax])
@@ -85,7 +85,7 @@
 AC_SUBST(httpd_src)
 
 dnl *******************************************************
-dnl FDO 4.1.0 Configuration
+dnl FDO 4.2.0 Configuration
 dnl Include / lib paths
 dnl *******************************************************
 # custom Fdo path specification
@@ -96,9 +96,9 @@
         [custom_inc=DEFAULT])
 
 if test $custom_inc = "DEFAULT"; then
-    map_fdo_include="/usr/local/fdo-4.1.0/include"
+    map_fdo_include="/usr/local/fdo-4.2.0/include"
     if test -d $map_fdo_include; then
-        AC_MSG_NOTICE([Building with default location of FDO include files at /usr/local/fdo-4.1.0/include])
+        AC_MSG_NOTICE([Building with default location of FDO include files at /usr/local/fdo-4.2.0/include])
     else
         AC_MSG_ERROR([the default FDO include path $map_fdo_include is not a valid directory. Please use the custom option])
     fi
@@ -118,9 +118,9 @@
         [custom_lib=DEFAULT])
 
 if test $custom_lib = "DEFAULT"; then
-    map_fdo_lib="/usr/local/fdo-4.1.0/lib"
+    map_fdo_lib="/usr/local/fdo-4.2.0/lib"
     if test -d $map_fdo_lib; then
-        AC_MSG_NOTICE([Building with default location of FDO libraries at /usr/local/fdo-4.1.0/lib])
+        AC_MSG_NOTICE([Building with default location of FDO libraries at /usr/local/fdo-4.2.0/lib])
     else
         AC_MSG_ERROR([the default FDO lib path $map_fdo_lib is not a valid directory. Please use the custom option])
     fi
@@ -132,7 +132,7 @@
         AC_MSG_ERROR([the specified FDO library path $custom_lib is not a valid directory])
     fi
 fi
-map_fdo_nls="/usr/local/fdo-4.1.0/nls/%N"
+map_fdo_nls="/usr/local/fdo-4.2.0/nls/%N"
 AC_SUBST(map_fdo_include)
 AC_SUBST(map_fdo_lib)
 AC_SUBST(map_fdo_nls)