[tracker-miners] configure: Remove pre-split leftovers
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners] configure: Remove pre-split leftovers
- Date: Thu, 31 Aug 2017 18:39:53 +0000 (UTC)
commit 0f5353f744d7140cd649f9f039c092a5b8d92fdb
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Aug 31 19:11:20 2017 +0200
configure: Remove pre-split leftovers
configure.ac | 98 +++------------------------------------------------------
1 files changed, 6 insertions(+), 92 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d247241..fbb4aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -614,98 +614,6 @@ fi
AM_CONDITIONAL(HAVE_HAL, test "x$have_hal" = "xyes")
##################################################################
-# Check for libtracker-data and libtracker-fts: Unicode support
-#
-# By default, AUTO with this order of preference:
-# 1) libunistring
-# 2) libicu
-##################################################################
-
-# Check for libunistring...
-AC_CHECK_HEADER(uniwbrk.h,
- AC_CHECK_LIB([unistring],
- [u8_wordbreaks],
- [have_libunistring=yes],
- [have_libunistring=no]))
-LIBUNISTRING_CFLAGS=""
-LIBUNISTRING_LIBS="-lunistring"
-
-# Check for libicu...
-PKG_CHECK_MODULES(LIBICU,
- [icu-i18n >= $LIBICU_REQUIRED icu-uc >= $LIBICU_REQUIRED],
- [have_libicu=yes],
- [have_libicu=no])
-
-# Configure option
-AC_ARG_WITH([unicode-support],
- AS_HELP_STRING([--with-unicode-support],
- [Unicode support library? (libunistring|libicu) [[default=auto]]]),
- [with_unicode_support=$withval],
- [with_unicode_support=auto])
-
-# If auto, decide ourselves
-if test "x$with_unicode_support" = "xauto"; then
- if test "x$have_libicu" = "xyes"; then
- with_unicode_support=libicu
- else
- if test "x$have_libunistring" = "xyes"; then
- with_unicode_support=libunistring
- else
- AC_MSG_ERROR([Could not find either libunistring or libicu])
- fi
- fi
-fi
-
-UNICODE_SUPPORT_CFLAGS=
-UNICODE_SUPPORT_LIBS=
-
-case "x$with_unicode_support" in
- # Use libunistring
- "xlibunistring")
- UNICODE_SUPPORT_CFLAGS=$LIBUNISTRING_CFLAGS
- UNICODE_SUPPORT_LIBS=$LIBUNISTRING_LIBS
- if test "x$have_libunistring" = "xyes"; then
- AC_DEFINE(HAVE_LIBUNISTRING, [1], [libunistring Unicode support library])
- else
- AC_MSG_ERROR([Could not find libunistring])
- fi
- ;;
- # Use libicu
- "xlibicu")
- UNICODE_SUPPORT_CFLAGS=$LIBICU_CFLAGS
- UNICODE_SUPPORT_LIBS=$LIBICU_LIBS
- if test "x$have_libicu" = "xyes"; then
- AC_DEFINE(HAVE_LIBICU, [1], [libicu Unicode support library])
- else
- AC_MSG_ERROR([Could not find libicu])
- fi
- ;;
- # Invalid option value
- *) AC_MSG_ERROR([Wrong value for --with-unicode-support: $with_unicode_support]) ;;
-esac
-
-AM_CONDITIONAL(HAVE_LIBICU, test "x$have_libicu" = "xyes")
-
-# Add to libtracker-common
-LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $UNICODE_SUPPORT_CFLAGS"
-LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $UNICODE_SUPPORT_LIBS"
-
-# Add to libtracker-fts
-LIBTRACKER_FTS_CFLAGS="$LIBTRACKER_FTS_CFLAGS $UNICODE_SUPPORT_CFLAGS"
-LIBTRACKER_FTS_LIBS="$LIBTRACKER_FTS_LIBS $UNICODE_SUPPORT_LIBS"
-
-# Add to libtracker-data
-LIBTRACKER_DATA_CFLAGS="$LIBTRACKER_DATA_CFLAGS $UNICODE_SUPPORT_CFLAGS"
-LIBTRACKER_DATA_LIBS="$LIBTRACKER_DATA_LIBS $UNICODE_SUPPORT_LIBS"
-
-# Add to libtracker-extract
-LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $UNICODE_SUPPORT_CFLAGS"
-LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $UNICODE_SUPPORT_LIBS"
-
-AM_CONDITIONAL(BUILD_LIBUNISTRING_PARSER, test "x$with_unicode_support" = "xlibunistring")
-AM_CONDITIONAL(BUILD_LIBICU_PARSER, test "x$with_unicode_support" = "xlibicu")
-
-##################################################################
# Check for libtracker-extract: libexif
##################################################################
@@ -1001,6 +909,12 @@ AC_ARG_ENABLE(icu-charset-detection,
[enable_icu_charset_detection=$enableval],
[enable_icu_charset_detection=auto])
+# Check for libicu...
+PKG_CHECK_MODULES(LIBICU,
+ [icu-i18n >= $LIBICU_REQUIRED icu-uc >= $LIBICU_REQUIRED],
+ [have_libicu=yes],
+ [have_libicu=no])
+
if test "x$have_libicu" = "xyes"; then
if test "x$enable_icu_charset_detection" != "xno"; then
have_libicu_charset_detection="yes"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]