[mapguide-commits] r6876 - in branches/2.4/MgDev: . Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-07-07 09:11:14 -0700 (Sat, 07 Jul 2012)
New Revision: 6876

Modified:
   branches/2.4/MgDev/Server/src/Core/Makefile.am
   branches/2.4/MgDev/configure.in
Log:
#2063: Add NLSPATH to mgserver.sh and mgserverd.sh allow for any FDO exceptions thrown to have actual messages instead of symbolic ids

Modified: branches/2.4/MgDev/Server/src/Core/Makefile.am
===================================================================
--- branches/2.4/MgDev/Server/src/Core/Makefile.am	2012-07-07 12:51:56 UTC (rev 6875)
+++ branches/2.4/MgDev/Server/src/Core/Makefile.am	2012-07-07 16:11:14 UTC (rev 6876)
@@ -387,8 +387,6 @@
 	@cp -fp ../../RepositoryAdmin/*.pdf $(repositoryadmindir)
 	@cp -fp ../../RepositoryAdmin/license.txt $(repositoryadmindir)
 	@cp -fp ../../RepositoryAdmin/php.ini $(repositoryadmindir)
-	@pushd $(fdodir); ln -s libxalanMsg.so.17.0 libxalanMsg.so.17; ln -s libxalanMsg.so.17.0 libxalanMsg.so; popd;
-	@pushd $(fdodir); ln -s libxerces-c.so.25.0 libxerces-c.so.25; ln -s libxerces-c.so.25.0 libxerces-c.so; popd;
 
 install-data-hook:
 	@sed -e 's#^FdoPath.*=.*#FdoPath                            = $(map_fdo_lib)#' \
@@ -412,6 +410,7 @@
 	@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
+	@echo 'export NLSPATH=$(map_fdo_nls):"$$NLSPATH"' >> ${prefix}/bin/mgserver.sh
 	@echo 'pushd ${prefix}/bin' >> ${prefix}/bin/mgserver.sh
 	@cp -f ${prefix}/bin/mgserver.sh ${prefix}/bin/mgserverd.sh
 	@echo './mgserver run' >> ${prefix}/bin/mgserver.sh

Modified: branches/2.4/MgDev/configure.in
===================================================================
--- branches/2.4/MgDev/configure.in	2012-07-07 12:51:56 UTC (rev 6875)
+++ branches/2.4/MgDev/configure.in	2012-07-07 16:11:14 UTC (rev 6876)
@@ -101,9 +101,10 @@
         AC_MSG_ERROR([the specified FDO library path $custom_lib is not a valid directory])
     fi
 fi
-
+map_fdo_nls="/usr/local/fdo-3.7.0/nls/%N"
 AC_SUBST(map_fdo_include)
 AC_SUBST(map_fdo_lib)
+AC_SUBST(map_fdo_nls)
 
 dnl *******************************************************
 dnl GCC Compiler Configuration