Kaydet (Commit) 2e594d16 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix liblangtag and GLib checks for iOS and Android

Change-Id: If6b46ebdb63d7688830f5ee712c124c07e93661b
üst 8a026375
...@@ -11272,9 +11272,9 @@ fi ...@@ -11272,9 +11272,9 @@ fi
AC_SUBST(SYSTEM_GLIB) AC_SUBST(SYSTEM_GLIB)
if test "$SYSTEM_GLIB" = "YES"; then if test "$SYSTEM_GLIB" = "YES"; then
PKG_CHECK_MODULES( GLIB, glib-2.0 ) PKG_CHECK_MODULES( GLIB, glib-2.0 )
else elif test $_os != iOS -a $_os != Android; then
BUILD_TYPE="$BUILD_TYPE GLIB" BUILD_TYPE="$BUILD_TYPE GLIB"
fi fi
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
...@@ -11285,17 +11285,17 @@ dnl =================================================================== ...@@ -11285,17 +11285,17 @@ dnl ===================================================================
ENABLE_LIBLANGTAG= ENABLE_LIBLANGTAG=
SYSTEM_LIBLANGTAG= SYSTEM_LIBLANGTAG=
AC_MSG_CHECKING([whether to use liblangtag]) AC_MSG_CHECKING([whether to use liblangtag])
if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a "$CROSS_COMPILING" != "YES" \); then if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS \); then
ENABLE_LIBLANGTAG=YES ENABLE_LIBLANGTAG=YES
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether to use system liblangtag]) AC_MSG_CHECKING([whether to use system liblangtag])
if test -n "$with_system_liblangtag"; then if test -n "$with_system_liblangtag"; then
SYSTEM_LIBLANGTAG=YES SYSTEM_LIBLANGTAG=YES
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3)
else else
SYSTEM_LIBLANGTAG=NO SYSTEM_LIBLANGTAG=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
fi fi
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment