[tracker/parser-unicode-libs-review] Only look for unicode libs when needed
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/parser-unicode-libs-review] Only look for unicode libs when needed
- Date: Wed, 5 May 2010 14:11:33 +0000 (UTC)
commit 0f4c7c8b1ac8f952d2c88b1318da7fad5d3099ec
Author: Aleksander Morgado <aleksander lanedo com>
Date: Wed May 5 16:11:14 2010 +0200
Only look for unicode libs when needed
configure.ac | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 258b56b..c3192a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -834,20 +834,6 @@ AM_CONDITIONAL(HAVE_MINER_FLICKR, test "x$have_miner_flickr" = "xyes")
# 3) glib
##################################################################
-# Check for libunistring...
-AC_CHECK_HEADER(uniwbrk.h,
- AC_CHECK_LIB(unistring, u8_wordbreaks))
-have_libunistring=${ac_cv_lib_unistring_u8_wordbreaks:-no}
-LIBUNISTRING_CFLAGS="$CFLAGS"
-LIBUNISTRING_LIBS="$LIBS"
-
-# Check for libicu... Note that AC_CHECK_LIB cannot be used as
-# symbol name includes libicu library version... don't want to
-# look for ubrk_next_4_2
-AC_CHECK_HEADER(unicode/ubrk.h, [have_libicu=yes],[have_libicu=no])
-LIBICU_CFLAGS=""
-LIBICU_LIBS="-licuuc"
-
# Configure option
AC_ARG_WITH([unicode-support],
AS_HELP_STRING([--with-unicode-support],
@@ -869,6 +855,12 @@ fi
case "x$with_unicode_support" in
# Use libunistring
"xlibunistring")
+ # Check for libunistring...
+ AC_CHECK_HEADER(uniwbrk.h,
+ AC_CHECK_LIB(unistring, u8_wordbreaks))
+ have_libunistring=${ac_cv_lib_unistring_u8_wordbreaks:-no}
+ LIBUNISTRING_CFLAGS="$CFLAGS"
+ LIBUNISTRING_LIBS="$LIBS"
AC_SUBST(LIBUNISTRING_CFLAGS)
AC_SUBST(LIBUNISTRING_LIBS)
if test "x$have_libunistring" = "xyes"; then
@@ -879,6 +871,12 @@ case "x$with_unicode_support" in
;;
# Use libicu
"xlibicu")
+ # Check for libicu... Note that AC_CHECK_LIB cannot be used as
+ # symbol name includes libicu library version... don't want to
+ # look for ubrk_next_4_2
+ AC_CHECK_HEADER(unicode/ubrk.h, [have_libicu=yes],[have_libicu=no])
+ LIBICU_CFLAGS=""
+ LIBICU_LIBS="-licuuc"
AC_SUBST(LIBICU_CFLAGS)
AC_SUBST(LIBICU_LIBS)
if test "x$have_libicu" = "xyes"; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]