[mapguide-commits] r8887 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-03-15 04:49:46 -0700 (Tue, 15 Mar 2016)
New Revision: 8887

Modified:
   trunk/MgDev/configure.in
Log:
Downgrade FDO back to 4.0 until we have an actual 4.1 OS branch to build against.

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2016-03-14 16:56:59 UTC (rev 8886)
+++ trunk/MgDev/configure.in	2016-03-15 11:49:46 UTC (rev 8887)
@@ -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.0.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.0.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.0.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.0.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.0.0/nls/%N"
 AC_SUBST(map_fdo_include)
 AC_SUBST(map_fdo_lib)
 AC_SUBST(map_fdo_nls)