[sword-svn] r2133 - in trunk: . utilities/diatheke

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-01-21 16:53:42 -0700 (Mon, 21 Jan 2008)
New Revision: 2133

Modified:
   trunk/configure.ac
   trunk/utilities/diatheke/diathekemgr.cpp
   trunk/utilities/diatheke/diathekemgr.h
Log:
Migrated _ICU_ define up to top level.
Updated diatheke to compile again with _ICU_ option on


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-01-21 19:08:55 UTC (rev 2132)
+++ trunk/configure.ac	2008-01-21 23:53:42 UTC (rev 2133)
@@ -73,6 +73,28 @@
 AM_MAINTAINER_MODE
 
 # ---------------------------------------------------------------------
+# Debug and profile
+# ---------------------------------------------------------------------
+
+# these are first because the SET AM_C.*FLAGS, not just append
+if test x$enable_debug = xyes; then
+  GCJFLAGS="-g -O0"
+  if test x$ac_cv_prog_cc_g = xyes; then
+    AM_CFLAGS="-g3 -O0 -Wall"
+  else
+    AM_CFLAGS="-O0 -Wall"
+  fi
+  if test x$ac_cv_prog_cxx_g = xyes; then
+    AM_CXXFLAGS="-g3 -O0 -Wall"
+  else
+    AM_CXXFLAGS="-O0 -Wall"
+  fi
+else
+  AM_CFLAGS="-O2"
+  AM_CXXFLAGS="-O2"
+fi
+
+# ---------------------------------------------------------------------
 # Check libraries
 # ---------------------------------------------------------------------
 if test x$with_zlib  = xyes; then
@@ -139,30 +161,12 @@
 	   ICU_LIBS=`$ICU_CONFIG --ldflags`
 	   ICU_IOLIBS=`if test $(echo "$ICU_VER >= 3.0"|bc) -eq 1; then $ICU_CONFIG --ldflags-icuio; else $ICU_CONFIG --ldflags-ustdio; fi;`
 	fi
+     AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
+     AM_CFLAGS="$AM_CFLAGS -D_ICU_"
 fi
 
-# ---------------------------------------------------------------------
-# Debug and profile
-# ---------------------------------------------------------------------
 
 AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-
-if test x$enable_debug = xyes; then
-  GCJFLAGS="-g -O0"
-  if test x$ac_cv_prog_cc_g = xyes; then
-    AM_CFLAGS="-g3 -O0 -Wall"
-  else
-    AM_CFLAGS="-O0 -Wall"
-  fi
-  if test x$ac_cv_prog_cxx_g = xyes; then
-    AM_CXXFLAGS="-g3 -O0 -Wall"
-  else
-    AM_CXXFLAGS="-O0 -Wall"
-  fi
-else
-  AM_CFLAGS="-O2"
-  AM_CXXFLAGS="-O2"
-fi
 #  AC_DEFINE(DEBUG)
 #else
 #  AC_DEFINE(NDEBUG)

Modified: trunk/utilities/diatheke/diathekemgr.cpp
===================================================================
--- trunk/utilities/diatheke/diathekemgr.cpp	2008-01-21 19:08:55 UTC (rev 2132)
+++ trunk/utilities/diatheke/diathekemgr.cpp	2008-01-21 23:53:42 UTC (rev 2133)
@@ -10,6 +10,8 @@
 #include <gbfhtmlhref.h>
 #include <thmlrtf.h>
 #include <gbfrtf.h>
+#include <utilstr.h>
+#include <swmodule.h>
 
 #include <swconfig.h>
 #include "diafiltmgr.h"
@@ -89,8 +91,8 @@
 signed char DiathekeMgr::Load () {
 	signed char retval =  SWMgr::Load();
 #ifdef _ICU_
-	optionFilters.insert(FilterMap::value_type("UTF8Transliterator", transliterator));
-        options.push_back(transliterator->getOptionName());
+	optionFilters["UTF8Transliterator"] = transliterator;
+	options.push_back(transliterator->getOptionName());
 #endif
 	return retval;
 };

Modified: trunk/utilities/diatheke/diathekemgr.h
===================================================================
--- trunk/utilities/diatheke/diathekemgr.h	2008-01-21 19:08:55 UTC (rev 2132)
+++ trunk/utilities/diatheke/diathekemgr.h	2008-01-21 23:53:42 UTC (rev 2133)
@@ -9,7 +9,7 @@
 class DiathekeMgr : public SWMgr {
 	SWFilter *arshaping;
 	SWFilter *bidireorder;
-    SWFilter *transliterator;
+    SWOptionFilter *transliterator;
 
 #ifdef WIN32
         char platformID;