[sword-svn] r2241 - in trunk: . utilities

[scribe at crosswire.org]

Author: scribe
Date: 2009-02-08 08:58:24 -0700 (Sun, 08 Feb 2009)
New Revision: 2241

Modified:
   trunk/usrinst.sh
   trunk/utilities/tei2mod.cpp
Log:
rearranged usrinst.sh options around a bit
fixed a compile issue with const-ifying temporaries


Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2009-02-08 00:47:44 UTC (rev 2240)
+++ trunk/usrinst.sh	2009-02-08 15:58:24 UTC (rev 2241)
@@ -1,20 +1,21 @@
 #!/bin/sh
 
 OPTIONS="--prefix=/usr $OPTIONS"
+OPTIONS="--libdir=/usr/lib64 $OPTIONS"
+OPTIONS="--sysconfdir=/etc $OPTIONS"
+OPTIONS="--without-conf $OPTIONS"
 OPTIONS="--disable-shared $OPTIONS"
-OPTIONS="--without-conf $OPTIONS"
-OPTIONS="--sysconfdir=/etc $OPTIONS"
-#OPTIONS="--with-vcl $OPTIONS"
 OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
+
 OPTIONS="--with-icu $OPTIONS"
 #OPTIONS="--without-clucene $OPTIONS"
 #OPTIONS="--without-curl $OPTIONS"
-#OPTIONS="--enable-tests $OPTIONS"
-OPTIONS="--disable-utilities $OPTIONS"
-OPTIONS="--libdir=/usr/lib64 $OPTIONS"
 
+OPTIONS="--enable-tests $OPTIONS"
+#OPTIONS="--disable-utilities $OPTIONS"
 
+
 CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*
 
 echo ""

Modified: trunk/utilities/tei2mod.cpp
===================================================================
--- trunk/utilities/tei2mod.cpp	2009-02-08 00:47:44 UTC (rev 2240)
+++ trunk/utilities/tei2mod.cpp	2009-02-08 15:58:24 UTC (rev 2241)
@@ -203,7 +203,7 @@
 	module->setEntry(text);
 }
 
-void linkToEntry(SWBuf &keyBuf, SWBuf &linkBuf) {
+void linkToEntry(const SWBuf &keyBuf, const SWBuf &linkBuf) {
        	SWKey tmpkey = linkBuf.c_str();
 	module->linkEntry(&tmpkey);
 #ifdef DEBUG