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

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-09-02 13:13:18 -0700 (Sun, 02 Sep 2007)
New Revision: 2072

Modified:
   trunk/configure.ac
   trunk/include/config.h
   trunk/include/swbuf.h
   trunk/sword.pc.in
Log:
Fixed a potential bug when using empty data with SWBuf <<
Moved icu tools to be default to /usr/bin/ instead of /usr/sbin/
Added clucene and zlib back to sword.pc



Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-09-01 22:05:38 UTC (rev 2071)
+++ trunk/configure.ac	2007-09-02 20:13:18 UTC (rev 2072)
@@ -121,10 +121,10 @@
 ICU_LIBS=
 ICU_IOLIBS=
 if test x$with_icu = xyes; then
-	AC_PATH_PROG([PKGDATA], [pkgdata],[/usr/sbin/pkgdata],[$PATH:/usr/sbin:.])
-	AC_PATH_PROG([GENCCODE], [genccode], [/usr/sbin/genccode], [$PATH:/usr/sbin:.])
-	AC_PATH_PROG([GENCMN], [gencmn], [/usr/sbin/gencmn], [$PATH:/usr/sbin:.])
-	AC_PATH_PROG([GENRB], [genrb], [/usr/sbin/genrb], [$PATH:/usr/sbin:.])
+	AC_PATH_PROG([PKGDATA], [pkgdata],[/usr/bin/pkgdata],[$PATH:/usr/sbin:.])
+	AC_PATH_PROG([GENCCODE], [genccode], [/usr/bin/genccode], [$PATH:/usr/sbin:.])
+	AC_PATH_PROG([GENCMN], [gencmn], [/usr/bin/gencmn], [$PATH:/usr/sbin:.])
+	AC_PATH_PROG([GENRB], [genrb], [/usr/bin/genrb], [$PATH:/usr/sbin:.])
 	
 	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
 # The icu-config script was new in icu 2.2

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2007-09-01 22:05:38 UTC (rev 2071)
+++ trunk/include/config.h	2007-09-02 20:13:18 UTC (rev 2072)
@@ -1,4 +1,4 @@
-/* include/config.h.  Generated from config.h.in by configure.  */
+/* include/config.h.  Generated by configure.  */
 /* include/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */

Modified: trunk/include/swbuf.h
===================================================================
--- trunk/include/swbuf.h	2007-09-01 22:05:38 UTC (rev 2071)
+++ trunk/include/swbuf.h	2007-09-02 20:13:18 UTC (rev 2072)
@@ -320,7 +320,7 @@
 	inline SWBuf &operator -=(unsigned long len) { setSize(length()-len); return *this; }
 	inline SWBuf &operator --(int) { operator -=(1); return *this; }
 
-	inline SWBuf &operator <<(unsigned long n) { n = (n<=length())?n:(length()-1); memmove(buf, buf+n, length()-n); (*this)-=n; return *this; }
+	inline SWBuf &operator <<(unsigned long n) { if (n && length()) { n = (n<=length())?n:(length()-1); memmove(buf, buf+n, length()-n); (*this)-=n; } return *this; }
 	inline SWBuf &operator >>(unsigned long n) { setSize(length()+n); memmove(buf+n, buf, length()-n); return *this; }
 	inline SWBuf operator +(const SWBuf &other) const {
 		SWBuf retVal = buf;

Modified: trunk/sword.pc.in
===================================================================
--- trunk/sword.pc.in	2007-09-01 22:05:38 UTC (rev 2071)
+++ trunk/sword.pc.in	2007-09-02 20:13:18 UTC (rev 2072)
@@ -7,6 +7,6 @@
 Name: SWORD
 Description: Biblical Text Engine
 Version: @VERSION@
-Libs: -L${libdir} -lsword @ICU_LIBS@ @ICU_IOLIBS@
+Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
 Cflags: -I${includedir}/sword