Author: cazfi
Date: Tue Apr 21 18:04:00 2015
New Revision: 28837

URL: http://svn.gna.org/viewcvs/freeciv?rev=28837&view=rev
Log:
Configure check for libicu, link against it.

See patch #3838

Modified:
    trunk/configure.ac
    trunk/doc/README.packaging

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=28837&r1=28836&r2=28837&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Tue Apr 21 18:04:00 2015
@@ -564,6 +564,11 @@
   UTILITY_LIBS="${UTILITY_LIBS} ${LIBXML2_LIBS}"
   AC_DEFINE([HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
 fi
+
+PKG_CHECK_MODULES([ICU], [icu-uc],,
+    [AC_MSG_ERROR([icu development files required])])
+UTILITY_CFLAGS="${UTILITY_CFLAGS} ${ICU_CFLAGS}"
+UTILITY_LIBS="${UTILITY_LIBS} ${ICU_LIBS}"
 
 dnl Set debug flags supported by compiler
 EXTRA_DEBUG_CFLAGS=""

Modified: trunk/doc/README.packaging
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=28837&r1=28836&r2=28837&view=diff
==============================================================================
--- trunk/doc/README.packaging  (original)
+++ trunk/doc/README.packaging  Tue Apr 21 18:04:00 2015
@@ -20,6 +20,7 @@
 * Minimum autoconf version is now 2.62, automake 1.11
 * Tinycthreads can be used as threading implementation. Copy of tinycthreads
   can be compiled in to freeciv by configuring with --with-tinycthread.
+* libicu is a new hard requirement
 
 ----------------------------------------------------------------------
 Compatibility of modified versions


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to