[sword-svn] r2480 - in trunk: . include

[scribe at crosswire.org]

Author: scribe
Date: 2009-12-03 18:36:41 -0700 (Thu, 03 Dec 2009)
New Revision: 2480

Modified:
   trunk/configure.ac
   trunk/include/config.h
   trunk/usrinst.sh
Log:
added with_icusword as configure option


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-12-04 00:15:49 UTC (rev 2479)
+++ trunk/configure.ac	2009-12-04 01:36:41 UTC (rev 2480)
@@ -42,6 +42,8 @@
 	AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)
 AC_ARG_WITH(icu,
 	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=no)]),,with_icu=no)
+AC_ARG_WITH(icusword,
+	AC_HELP_STRING([--with-icusword],[use custom SWORD ICU (default=no)]),,with_icusword=no)
 AC_ARG_WITH(conf,
 	AC_HELP_STRING([--with-conf],[install a new sword.conf (default=yes)]),,with_conf=yes)
 #AC_ARG_WITH(installmgr,
@@ -181,8 +183,10 @@
 fi
 
 
-# why?  what is this for?
-with_swordicu=$with_icu
+if test x$with_icusword = xyes; then
+AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_"
+AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
+fi
 
 
 AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
@@ -260,6 +264,7 @@
 # ---------------------------------------------------------------------
 AC_SUBST(with_zlib)
 AC_SUBST(with_icu)
+AC_SUBST(with_icusword)
 AC_SUBST(with_conf)
 AC_SUBST(dir_confdef)
 AC_SUBST(CC)
@@ -284,7 +289,7 @@
 # don't #ifdef in .cpp files HAVE_ stuff because non-ac compiles won't be able to switch them since we include config.h
 AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes)
 AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes)
-AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_swordicu = xyes)
+AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes)
 AM_CONDITIONAL(HAVE_VSNPRINTF, test x$have_vsnprintf = xyes)
 
 AM_CONDITIONAL(MINGW, test x$target_mingw32 = xyes)
@@ -312,7 +317,7 @@
 COLORED_ECHO([    PROFILE:          $enable_profile])
 COLORED_ECHO([    LIBZ:             $with_zlib])
 COLORED_ECHO([    ICU:              $with_icu])
-COLORED_ECHO([    ICUSWORD:         $with_swordicu])
+COLORED_ECHO([    ICUSWORD:         $with_icusword])
 COLORED_ECHO([    CURL:             $with_curl])
 COLORED_ECHO([    INTERNAL FTPLIB:  $with_internalftplib])
 COLORED_ECHO([    CLUCENE:          $with_clucene])

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-12-04 00:15:49 UTC (rev 2479)
+++ trunk/include/config.h	2009-12-04 01:36:41 UTC (rev 2480)
@@ -59,6 +59,9 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sword"
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "1.6.0"
 

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2009-12-04 00:15:49 UTC (rev 2479)
+++ trunk/usrinst.sh	2009-12-04 01:36:41 UTC (rev 2480)
@@ -29,6 +29,7 @@
 #OPTIONS="--enable-profile $OPTIONS"
 
 OPTIONS="--with-icu $OPTIONS"
+#OPTIONS="--with-icusword $OPTIONS"
 #OPTIONS="--without-clucene $OPTIONS"
 #OPTIONS="--without-curl $OPTIONS"