[mapguide-commits] r5017 - in sandbox/rfc102/MgDev: Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfParser Common/PlatformBase Oem Server/src/Common/Manager Server/src/Core Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Rendering Server/src/Services/Site Server/src/UnitTesting Web/src/CgiAgent Web/src/HttpHandler Web/src/JavaApi Web/src/PhpApi Web/src/WebApp

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Jul 9 11:17:07 EDT 2010 

Author: rohitr
Date: 2010-07-09 15:17:07 +0000 (Fri, 09 Jul 2010)
New Revision: 5017

Modified:
   sandbox/rfc102/MgDev/Common/Foundation/Makefile.am
   sandbox/rfc102/MgDev/Common/Geometry/Makefile.am
   sandbox/rfc102/MgDev/Common/MapGuideCommon/Makefile.am
   sandbox/rfc102/MgDev/Common/MdfParser/Makefile.am
   sandbox/rfc102/MgDev/Common/PlatformBase/Makefile.am
   sandbox/rfc102/MgDev/Oem/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Common/Manager/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Core/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Drawing/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Feature/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Kml/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Mapping/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Rendering/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Site/Makefile.am
   sandbox/rfc102/MgDev/Server/src/UnitTesting/Makefile.am
   sandbox/rfc102/MgDev/Web/src/CgiAgent/Makefile.am
   sandbox/rfc102/MgDev/Web/src/HttpHandler/Makefile.am
   sandbox/rfc102/MgDev/Web/src/JavaApi/Makefile.am
   sandbox/rfc102/MgDev/Web/src/PhpApi/Makefile.am
   sandbox/rfc102/MgDev/Web/src/WebApp/Makefile.am
Log:
changed makefiles to use /usr/local/ prefix for dbxml. 	


Modified: sandbox/rfc102/MgDev/Common/Foundation/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Common/Foundation/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Common/Foundation/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -231,7 +231,7 @@
   -I../Security \
   -I../MdfModel \
   -I../../Oem/ACE/ACE_wrappers \
-  -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+  -I/usr/local/include
 
 libMgFoundation_la_LIBADD = \
   -lACE \
@@ -241,6 +241,6 @@
 
 libMgFoundation_la_LDFLAGS = -release $(PACKAGE_VERSION) \
   -L../../Oem/ACE/ACE_wrappers/ace \
-  -L../../Oem/dbxml-2.3.10/install/lib \
+  -L/usr/local/lib \
   -L../MdfParser \
   -L../MdfModel

Modified: sandbox/rfc102/MgDev/Common/Geometry/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Common/Geometry/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Common/Geometry/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -400,7 +400,7 @@
   -I../Geometry \
   -I../../Oem/ACE/ACE_wrappers \
   -I../../Oem/geos-2.2.0/source/headers \
-  -I../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../Oem/CsMap/Include \
   -I../../Common/CoordinateSystem
 

Modified: sandbox/rfc102/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Common/MapGuideCommon/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Common/MapGuideCommon/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -262,7 +262,7 @@
   -I../Geometry \
   -I../../Oem/ACE/ACE_wrappers \
   -I../../Oem/geos-2.2.0/source/headers \
-  -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+  -I/usr/local/include
 
 libMgMapGuideCommon_la_LIBADD = \
   -lACE \

Modified: sandbox/rfc102/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Common/MdfParser/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Common/MdfParser/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -4,7 +4,7 @@
 
 INCLUDES = \
   -I../MdfModel/ \
-  -I../../Oem/dbxml-2.3.10/xerces-c-src/src/
+  -I/usr/local/include
 
 lib_LTLIBRARIES = libMgMdfParser.la
 

Modified: sandbox/rfc102/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Common/PlatformBase/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Common/PlatformBase/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -251,7 +251,7 @@
   -I../Geometry \
   -I../../Oem/ACE/ACE_wrappers \
   -I../../Oem/geos-2.2.0/source/headers \
-  -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+  -I/usr/local/include
 
 libMgPlatformBase_la_LIBADD = \
   -lACE \

Modified: sandbox/rfc102/MgDev/Oem/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Oem/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Oem/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -3,7 +3,7 @@
 
 SUBDIRS = $(map_opt_oem_subdirs)
 DIST_SUBDIRS =
-EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml-2.3.10 DWFTK7.1 FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
+EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14  DWFTK7.1 FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
 
 dist-hook:
 
@@ -12,11 +12,11 @@
 	@mkdir -p ${prefix}/lib
 	@cp -fp ACE/ACE_wrappers/ace/*.so ${prefix}/lib
 	@cp -fp jsoncpp/lib/*.so ${prefix}/lib
-	@cp -fpd dbxml-2.3.10/install/lib/libxerces-c*.so* ${prefix}/lib
-	@cp -fpd dbxml-2.3.10/install/lib/libxqilla*.so* ${prefix}/lib
-	@cp -fpd dbxml-2.3.10/install/lib/libdb-*.so* ${prefix}/lib
-	@cp -fpd dbxml-2.3.10/install/lib/libdb_cxx*.so* ${prefix}/lib
-	@cp -fpd dbxml-2.3.10/install/lib/libdbxml*.so* ${prefix}/lib
+	@cp -fpd /usr/local/lib/libxerces-c*.so* ${prefix}/lib
+	@cp -fpd /usr/local/lib/libxqilla*.so* ${prefix}/lib
+	@cp -fpd /usr/local/lib/libdb-*.so* ${prefix}/lib
+	@cp -fpd /usr/local/lib/libdb_cxx*.so* ${prefix}/lib
+	@cp -fpd /usr/local/lib/libdbxml*.so* ${prefix}/lib
 	@cp -fp  DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore-* ${prefix}/lib
 	@cp -fpd DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore ${prefix}/lib
 	@cp -fp  DWFTK7.1/develop/global/src/dwfemap/.libs/libdwfemap-* ${prefix}/lib

Modified: sandbox/rfc102/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Common/Manager/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Common/Manager/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -7,7 +7,7 @@
 INCLUDES = \
   -I../../../../Oem/ACE/ACE_wrappers \
   -I$(map_fdo_include) \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../../../Common \
   -I../../../../Common/Security \
   -I../../../../Common/Foundation \

Modified: sandbox/rfc102/MgDev/Server/src/Core/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Core/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Core/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -9,7 +9,7 @@
 
 INCLUDES = \
   -I../../../Oem/ACE/ACE_wrappers \
-  -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I $(map_fdo_include) \
   -I $(map_fdo_include)/ExpressionEngine \
   -I../Common \
@@ -98,8 +98,6 @@
   -lexpat \
   -lFDO-3.5.0 \
   -lExpressionEngine \
-  -lxalanMsg \
-  -lxalan-c \
   -lxerces-c \
   -lxqilla \
   -lMgFoundation \
@@ -131,7 +129,7 @@
   -R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwfcore \
   -R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwf \
   -R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwfemap \
-  -R$(map_srcdir)/Oem/dbxml-2.3.10/install/lib \
+  -R$/usr/local/lib \
   -R$(map_srcdir)/Common/CoordinateSystem/.libs \
   -R$(map_srcdir)/Common/MdfModel/.libs \
   -R$(map_srcdir)/Common/MdfParser/.libs \
@@ -160,7 +158,7 @@
   -L../../../Oem/DWFTK7.1/develop/global/src/dwfcore \
   -L../../../Oem/DWFTK7.1/develop/global/src/dwf \
   -L../../../Oem/DWFTK7.1/develop/global/src/dwfemap \
-  -L../../../Oem/dbxml-2.3.10/install/lib \
+  -L/usr/local/lib \
   -L$(top_builddir)/Common/CoordinateSystem \
   -L../../../Common/MdfModel \
   -L../../../Common/MdfParser \
@@ -367,17 +365,17 @@
 				cp -f -r $(mentor_dict_source_dir)/* $(mentor_dict_install_dir);)
 	@cp -fp ../../../Common/Schema/*.xsd $(schemadir)
 	@cp -fp ../../../Oem/DWFTK7.1/develop/global/fonts/* ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_archive ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_checkpoint ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_dump ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_hotbackup ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_load ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_recover ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_upgrade ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_verify ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml_dump ${prefix}/bin/
-	@cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml_load ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_archive ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_checkpoint ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_dump ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_hotbackup ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_load ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_recover ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_upgrade ${prefix}/bin/
+	@cp -fp /usr/local/bin/db_verify ${prefix}/bin/
+	@cp -fp /usr/local/bin/dbxml ${prefix}/bin/
+	@cp -fp /usr/local/bin/dbxml_dump ${prefix}/bin/
+	@cp -fp /usr/local/bin/dbxml_load ${prefix}/bin/
 	@cp -fp ../../RepositoryAdmin/*.sh $(repositoryadmindir)
 	@cp -fp ../../RepositoryAdmin/*.php $(repositoryadmindir)
 	@cp -fp ../../RepositoryAdmin/*.inc $(repositoryadmindir)
@@ -404,7 +402,7 @@
              -e 's#^ResourceSchemaFilePath.*=.*#ResourceSchemaFilePath             = ${prefix}/Schema/#' \
              -e 's#^ResourceDataFileTrashFolderName.*=.*#ResourceDataFileTrashFolderName    = Trash#' \
            serverconfig.ini > ${prefix}/bin/serverconfig.ini
-	@echo '#!/bin/bash' > ${prefix}/bin/mgserver.sh
+	@echo '#!/bin/sh' > ${prefix}/bin/mgserver.sh
 	@echo '' >> ${prefix}/bin/mgserver.sh
 	@echo 'export MENTOR_DICTIONARY_PATH=$(mentor_dict_install_dir)' >> ${prefix}/bin/mgserver.sh
 	@echo 'export LD_LIBRARY_PATH=$(fdodir):"$$LD_LIBRARY_PATH"' >> ${prefix}/bin/mgserver.sh

Modified: sandbox/rfc102/MgDev/Server/src/Services/Drawing/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Drawing/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Drawing/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -13,7 +13,7 @@
   -I../../../../Common/MapGuideCommon \
   -I../../../../Oem/DWFTK7.1/develop/global/src \
   -I../../../../Oem/DWFTK7.1/develop/global/src/dwf \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../Common \
   -I../../Common/Base \
   -I../../Common/Manager \
@@ -67,7 +67,7 @@
 libMgServerDrawingService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lxerces-c
 
 libMgServerDrawingService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-  -L../../../../Oem/dbxml-2.3.10/install/lib \
+  -L/usr/local/lib \
   -L../../../../Common/Foundation \
   -L../../../../Common/Geometry \
   -L../../../../Common/PlatformBase \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Feature/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Feature/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -8,7 +8,7 @@
   -I$(map_fdo_include) \
   -I$(map_fdo_include)/ExpressionEngine \
   -I../../../../Oem/ACE/ACE_wrappers \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../Gws/Include \
   -I../../Gws/GwsCommon/inc \
   -I../../Gws/GwsQueryEngine/inc \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Kml/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Kml/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Kml/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -6,7 +6,7 @@
 
 INCLUDES = \
   -I../../../../Oem/ACE/ACE_wrappers \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../../../Oem/DWFTK7.1/develop/global/src \
   -I../../../../Common/Foundation \
   -I../../../../Common/Geometry \
@@ -16,7 +16,7 @@
   -I../../Common/Base \
   -I../../Common/Manager \
   -I$(map_fdo_include) \
-  -I$(map_fdo_include)/ExpressionEngine \
+  -I$(map_fdo_include)/ExpressionEngine \
   -I../../../../Common/MdfModel \
   -I../../../../Common/MdfParser \
   -I../../../../Common/CoordinateSystem \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Mapping/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Mapping/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Mapping/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -15,7 +15,7 @@
   -I../../../../Common/MdfParser \
   -I$(map_fdo_include) \
   -I$(map_fdo_include)/ExpressionEngine \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../../../Common/CoordinateSystem \
   -I../../../../Common/Foundation \
   -I../../../../Common/Geometry \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Rendering/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Rendering/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Rendering/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -8,7 +8,7 @@
   -I$(map_fdo_include) \
   -I$(map_fdo_include)/ExpressionEngine \
   -I../../../../Oem/ACE/ACE_wrappers \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../../../Common/Foundation \
   -I../../../../Common/Geometry \
   -I../../../../Common/PlatformBase \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Site/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Site/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/Services/Site/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -12,7 +12,7 @@
   -I../../../../Common/PlatformBase \
   -I../../../../Common/MapGuideCommon \
   -I../../../../Oem/ACE/ACE_wrappers \
-  -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../Common \
   -I../../Common/Base \
   -I../../Common/Manager \

Modified: sandbox/rfc102/MgDev/Server/src/UnitTesting/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/UnitTesting/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Server/src/UnitTesting/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -7,7 +7,7 @@
 INCLUDES = \
   -I../../../Oem/ACE/ACE_wrappers \
   -I../../../Oem/CppUnit-1.9.14/include \
-  -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+  -I/usr/local/include \
   -I../../../Common/Foundation \
   -I../../../Common/Geometry \
   -I../../../Common/PlatformBase \

Modified: sandbox/rfc102/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Web/src/CgiAgent/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Web/src/CgiAgent/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -43,7 +43,7 @@
 
 mapagent_LDFLAGS = \
             -L../../../Oem/ACE/ACE_wrappers/ace \
-            -L../../../Oem/dbxml-2.3.10/install/lib \
+            -L/usr/local/lib \
             -L../../../Common/CoordinateSystem \
             -L../../../Common/MdfModel \
             -L../../../Common/MdfParser \

Modified: sandbox/rfc102/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Web/src/HttpHandler/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Web/src/HttpHandler/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -10,7 +10,7 @@
               -I../../../Common/PlatformBase \
               -I../../../Common/MapGuideCommon \
               -I../../../Oem/ACE/ACE_wrappers \
-              -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+              -I/usr/local/include \
               -I../../../Oem/jsoncpp/include
 
 lib_LTLIBRARIES = libMgHttpHandler.la

Modified: sandbox/rfc102/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Web/src/JavaApi/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Web/src/JavaApi/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -22,7 +22,7 @@
            -I../HttpHandler \
            -I../WebSupport \
            -I../WebApp \
-           -I../../../Oem/dbxml-2.3.10/xerces-c-src/src
+           -I/usr/local/include
 
 BUILT_SOURCES = MgApi_wrap.cpp
 
@@ -54,7 +54,7 @@
     -L../../../Common/MapGuideCommon \
     -L../HttpHandler \
     -L../WebApp \
-    -L../../../Oem/dbxml-2.3.10/install/lib
+    -L/usr/local/lib
 
 MgApi_wrap.cpp : \
     ../WebApp/WebApp.h \

Modified: sandbox/rfc102/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Web/src/PhpApi/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Web/src/PhpApi/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -22,7 +22,7 @@
            -I../HttpHandler \
            -I../WebSupport \
            -I../WebApp \
-           -I../../../Oem/dbxml-2.3.10/xerces-c-src/src
+           -I/usr/local/include
 
 lib_LTLIBRARIES = libphp_MapGuideApi.la
 
@@ -52,7 +52,7 @@
     -L../../../Common/MapGuideCommon \
     -L../HttpHandler \
     -L../WebApp \
-    -L../../../Oem/dbxml-2.3.10/install/lib
+    -L/usr/local/lib
 
 MgApi_wrap.cpp : \
     ../WebApp/WebApp.h \

Modified: sandbox/rfc102/MgDev/Web/src/WebApp/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Web/src/WebApp/Makefile.am	2010-07-09 14:05:14 UTC (rev 5016)
+++ sandbox/rfc102/MgDev/Web/src/WebApp/Makefile.am	2010-07-09 15:17:07 UTC (rev 5017)
@@ -79,13 +79,13 @@
            -I../../../Common/Geometry \
            -I../../../Common/PlatformBase \
            -I../../../Common/MapGuideCommon \
-           -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+           -I/usr/local/include \
            -I../../../Oem/ACE/ACE_wrappers
 
 libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon
 
 libMgWebApp_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-            -L../../../Oem/dbxml-2.3.10/install/lib \
+            -L/usr/local/lib \
             -L../../../Common/Foundation \
             -L../../../Common/Geometry \
             -L../../../Common/PlatformBase \

More information about the mapguide-commits mailing list