[sword-cvs] sword/lib Makefile.am,1.10,1.11

sword@www.crosswire.org sword@www.crosswire.org
Fri, 11 Jul 2003 10:44:43 -0700


Update of /usr/local/cvsroot/sword/lib
In directory www:/tmp/cvs-serv4814/lib

Modified Files:
	Makefile.am 
Log Message:

dglassey: more makefile work
link to icuio instead of ustdio since that has change for more recent icu
  want a better solution to this as still want to link to ustdio for icu2.1
set the SWICU_DATA define
bump the so number for another incompatible interface


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/lib/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	8 Jul 2003 13:19:41 -0000	1.10
+++ Makefile.am	11 Jul 2003 17:44:41 -0000	1.11
@@ -17,7 +17,11 @@
 
 libsword_la_SOURCES =
 if ICU
-ICULIBADD = -licui18n -licuuc -lustdio
+#ICU 2.1
+#ICULIBADD = -licui18n -licuuc -lustdio
+#ICU 2.6
+ICULIBADD = -licui18n -licuuc -licuio
+INCLUDES += -DSWICU_DATA=\"${pkglibdir}/icu${ICU_VER}\" 
 else
 ICULIBADD =
 endif
@@ -30,7 +34,7 @@
 
 libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD)
 
-libsword_la_LDFLAGS = -version-info 1
+libsword_la_LDFLAGS = -version-info 3
 
 include ../src/keys/Makefile.am
 include ../src/utilfuns/Makefile.am