[sword-svn] r3171 - branches/sword-1-7-x

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:16:11 -0700 (Wed, 16 Apr 2014)
New Revision: 3171

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/configure.ac
Log:
Merging r3115 - fixed ICU discovery in autotools



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115

Modified: branches/sword-1-7-x/configure.ac
===================================================================
--- branches/sword-1-7-x/configure.ac	2014-04-17 04:14:38 UTC (rev 3170)
+++ branches/sword-1-7-x/configure.ac	2014-04-17 04:16:11 UTC (rev 3171)
@@ -172,36 +172,25 @@
 # ---------------------------------------------------------------------
 # Find ICU tools
 # ---------------------------------------------------------------------
-ICU_VER=
 ICU_LIBS=
 ICU_IOLIBS=
 if test x$with_icu = xyes; then
 	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 and assuming 2.1 or earlier"
-	   ICU_VER="2.1"
-	   ICU_LIBS="-licui18n -licuuc -licudata"
-	   ICU_IOLIBS="-lustdio"
-	else
-	   ICU_VER=`$ICU_CONFIG --version`
+	if test "$ICU_CONFIG" != "no" ; then
 	   ICU_LIBS=`$ICU_CONFIG --ldflags`
-	   #ICU_IOLIBS=`if test $(echo "$ICU_VER >= 3.0"|bc) -eq 1; then $ICU_CONFIG --ldflags-icuio; else $ICU_CONFIG --ldflags-ustdio; fi;`
 	   ICU_IOLIBS=`$ICU_CONFIG --ldflags-icuio`
+	   with_icu=yes
+	   LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS"
+	   AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
+	   AM_CFLAGS="$AM_CFLAGS -D_ICU_"
+	else
+	   echo "*** The icu-config script installed by icu could not be found"
+	   echo "*** compiling without ICU support"
+	   with_icu=no
 	fi
-     AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
-     AM_CFLAGS="$AM_CFLAGS -D_ICU_"
 fi
 
-if test "x$ICU_LIBS" != x; then
-	with_icu=yes
-	LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS"
-else
-	with_icu=no
-fi
 
-
 if test x$with_icusword = xyes; then
 AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_"
 AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
@@ -338,7 +327,6 @@
 AC_SUBST(with_conf)
 AC_SUBST(dir_confdef)
 AC_SUBST(CC)
-AC_SUBST(ICU_VER)
 AC_SUBST(enable_debug)
 AC_SUBST(enable_profile)