diff options
| author | Rene Engelhard <rene@debian.org> | 2012-09-11 02:29:09 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-09-11 13:42:59 +0200 |
| commit | b6640bdef03e89b720974d72ca42fb88937a70c8 (patch) | |
| tree | 0197a8e888caaba1d80bc41e52712b7f8d4a1ade /configure.in | |
| parent | 6c29057f55dc1afde8911ac527814ca09ead2c2f (diff) | |
implement --with-system-liblangtag
Change-Id: I182f95c294ec41cf74cd495fd6141a7d1c33b3ff
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/configure.in b/configure.in index a3ad4171bd8b..980486292b99 100644 --- a/configure.in +++ b/configure.in @@ -1642,6 +1642,11 @@ AC_ARG_WITH(system-orcus, [Use orcus library already on system.]),, [with_system_orcus="$with_system_libs"]) +AC_ARG_WITH(system-liblangtag, + AS_HELP_STRING([--with-system-liblangtag], + [Use orcus library already on system.]),, + [with_system_liblangtag="$with_system_libs"]) + AC_ARG_WITH(system-mozilla, AS_HELP_STRING([--with-system-mozilla], [Use Mozilla already on system. Note that some components cannot be built @@ -11247,34 +11252,41 @@ else fi AC_SUBST(SYSTEM_GLIB) +if test "$SYSTEM_GLIB" = "YES"; then + PKG_CHECK_MODULES( GLIB, glib-2.0 ) +else + BUILD_TYPE="$BUILD_TYPE GLIB" +fi +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) dnl =================================================================== dnl Test whether to use liblangtag dnl =================================================================== ENABLE_LIBLANGTAG= SYSTEM_LIBLANGTAG= -GLIB_CFLAGS='' -GLIB_LIBS='' +AC_MSG_CHECKING([whether to use liblangtag]) 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. - - if test "$SYSTEM_GLIB" = YES; then - PKG_CHECK_MODULES( GLIB, glib-2.0 ) + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([whether to use system liblangtag]) + if test -n "$with_system_liblangtag"; then + SYSTEM_LIBLANGTAG=YES + AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3) else - BUILD_TYPE="$BUILD_TYPE GLIB" + SYSTEM_LIBLANGTAG=NO + AC_MSG_RESULT([no]) + BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" fi - - dnl So far AFAIK no system has liblangtag, set this unconditionally for now. - dnl TODO Allow system liblangtag - BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" +else + ENABLE_LIBLANGTAG=NO + AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_LIBLANGTAG) AC_SUBST(SYSTEM_LIBLANGTAG) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) - +AC_SUBST(LIBLANGTAG_CFLAGS) +AC_SUBST(LIBLANGTAG_LIBS) dnl =================================================================== dnl Test whether to build gettext runtime (libintl) or rely on the |