[sword-cvs] sword configure.ac,1.26,1.27

[sword@www.crosswire.org]

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

Modified Files:
	configure.ac 
Log Message:

dglassey: hopefully handle different versions of icu right
  change the data directory for our icu files to
     $(libdir)/sword/$(swordver)_icu_$(icuver)/


Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.ac	11 Jul 2003 22:06:37 -0000	1.26
+++ configure.ac	11 Jul 2003 22:28:54 -0000	1.27
@@ -76,6 +76,8 @@
 # Find ICU tools
 # ---------------------------------------------------------------------
 ICU_VER=
+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:.])
@@ -83,11 +85,17 @@
 	AC_PATH_PROG([GENRB], [genrb], [/usr/sbin/genrb], [$PATH:/usr/sbin:.])
 	
 	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+# The icu-config script was new in icu 2.2
 	if test "$ICU_CONFIG" = "no" ; then
 	   echo "*** The icu-config script installed by icu could not be found"
-	   echo "*** continuing anyway"
+	   echo "*** continuing anyway and assuming 2.1 or earlier"
+	   ICU_VER="2.1"
+	   ICU_LIBS="-licui18n -licuuc -licudata"
+	   ICU_IOLIBS="-lustdio"
 	else
 	   ICU_VER=`$ICU_CONFIG --version`
+	   ICU_LIBS=`$ICU_CONFIG --ldflags`
+	   ICU_IOLIBS=`$ICU_CONFIG --ldflags-ustdio`
 	fi
 fi
 
@@ -208,6 +216,8 @@
 AC_SUBST(CC)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
+AC_SUBST(ICU_LIBS)
+AC_SUBST(ICU_IOLIBS)
 AC_SUBST(ICU_VER)
 AC_SUBST(enable_debug)
 AC_SUBST(enable_profile)