diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-08-10 10:27:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-08-10 16:44:26 +0200 |
| commit | 6a7b32b09e621364239bca6ec02c858b122e07b8 (patch) | |
| tree | 7e9d6ffa47102cb2d14d115326c9da0dec69c916 /configure.in | |
| parent | 26310504c3c20385caf35f5a703f1d5f1682b4c7 (diff) | |
Implement --disable-liblangtag, to be able to build without that.
Change-Id: Ic38d0282dba99efe2ecc45142a927ba3d8fa167d
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/configure.in b/configure.in index 7860aa292624..e0604571e36b 100644 --- a/configure.in +++ b/configure.in @@ -1066,6 +1066,12 @@ AC_ARG_ENABLE(winegcc, needed for MinGW cross-compilation.]), ) +AC_ARG_ENABLE(liblangtag, + AS_HELP_STRING([--disable-liblangtag], + [Disable use of liblangtag, and insted use an own simple + implementation.]), +) + dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== @@ -11084,37 +11090,33 @@ else fi AC_SUBST(SYSTEM_GLIB) -dnl Get system's glib flags and libs. -dnl The i18npool LanguageTag wrapper uses it for liblangtag. +dnl =================================================================== +dnl Test whether to use liblangtag +dnl =================================================================== +ENABLE_LIBLANGTAG= +SYSTEM_LIBLANGTAG= GLIB_CFLAGS='' GLIB_LIBS='' -if test "$SYSTEM_GLIB" = YES; then - PKG_CHECK_MODULES( GLIB, glib-2.0 ) -else - case "$_os" in - iOS|Android) - ;; - *) - BUILD_TYPE="$BUILD_TYPE GLIB" - ;; - esac -fi -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) +if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a "$CROSS_COMPILING" != "YES" \); then + ENABLE_LIBLANGTAG=YES + dnl Get system's glib flags and libs. + dnl The i18npool LanguageTag wrapper uses it for liblangtag. -dnl So far AFAIK no system has liblangtag, set this unconditionally for now. -dnl Except for Android and iOS where we don't want liblangtag. + if test "$SYSTEM_GLIB" = YES; then + PKG_CHECK_MODULES( GLIB, glib-2.0 ) + else + BUILD_TYPE="$BUILD_TYPE GLIB" + fi -SYSTEM_LIBLANGTAG=NO -case "$_os" in -iOS|Android) - ;; -*) + dnl So far AFAIK no system has liblangtag, set this unconditionally for now. + dnl TODO Allow system liblangtag BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" - ;; -esac +fi +AC_SUBST(ENABLE_LIBLANGTAG) AC_SUBST(SYSTEM_LIBLANGTAG) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) dnl =================================================================== |