From 8dc27a0bbf74646969074414c071410ad7d07b74 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Tue, 21 Feb 2017 12:36:55 +0200
Subject: Always enable liblangtag

The license should not be an issue any more since liblangtag now has an
LGPL/MPLv2 dual licence.

Change-Id: I4dfffcccf5d710bd16b21c3254c1449ae041b8ab
Reviewed-on: https://gerrit.libreoffice.org/34511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
---
 configure.ac | 53 ++++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a2448e416577..8756e529a9b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1485,12 +1485,6 @@ libo_FUZZ_ARG_ENABLE(firebird-sdbc,
         [Disable the build of the Firebird-SDBC driver if it doesn't compile for you.]),
 ,test "${enable_firebird_sdbc+set}" = set || enable_firebird_sdbc=yes)
 
-libo_FUZZ_ARG_ENABLE(liblangtag,
-    AS_HELP_STRING([--disable-liblangtag],
-        [Disable use of liblangtag, and instead use an own simple
-         implementation.]),
-)
-
 AC_ARG_ENABLE(bogus-pkg-config,
     AS_HELP_STRING([--enable-bogus-pkg-config],
         [MACOSX only: on MacOSX pkg-config can cause trouble. by default if one is found in the PATH, an error is issued. This flag turn that error into a warning.]),
@@ -11585,39 +11579,28 @@ AC_SUBST(AVAHI_LIBS)
 dnl ===================================================================
 dnl Test whether to use liblangtag
 dnl ===================================================================
-ENABLE_LIBLANGTAG=
 SYSTEM_LIBLANGTAG=
-AC_MSG_CHECKING([whether to use liblangtag])
-if test "$enable_liblangtag" = "yes" -o "$enable_liblangtag" = ""; then
-    ENABLE_LIBLANGTAG=TRUE
+AC_MSG_CHECKING([whether to use system liblangtag])
+if test "$with_system_liblangtag" = yes; then
+    SYSTEM_LIBLANGTAG=TRUE
     AC_MSG_RESULT([yes])
-    AC_MSG_CHECKING([whether to use system liblangtag])
-    if test "$with_system_liblangtag" = yes; then
-        SYSTEM_LIBLANGTAG=TRUE
-        AC_MSG_RESULT([yes])
-        PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
-        dnl cf. <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a build issue with inline keyword"
-        PKG_CHECK_EXISTS([liblangtag >= 0.5.5], [], [AC_DEFINE([LIBLANGTAG_INLINE_FIX])])
-        LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-        FilterLibs "${LIBLANGTAG_LIBS}"
-        LIBLANGTAG_LIBS="${filteredlibs}"
-    else
-        SYSTEM_LIBLANGTAG=
-        AC_MSG_RESULT([no])
-        BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
-        LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag"
-        if test "$COM" = "MSC"; then
-            LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
-        else
-            LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs -llangtag"
-        fi
-    fi
-    AC_DEFINE(ENABLE_LIBLANGTAG)
-else
+    PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
+    dnl cf. <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a build issue with inline keyword"
+    PKG_CHECK_EXISTS([liblangtag >= 0.5.5], [], [AC_DEFINE([LIBLANGTAG_INLINE_FIX])])
+    LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+    FilterLibs "${LIBLANGTAG_LIBS}"
+    LIBLANGTAG_LIBS="${filteredlibs}"
+else
+    SYSTEM_LIBLANGTAG=
     AC_MSG_RESULT([no])
-    LIBLANGTAG_CFLAGS="-DDISABLE_LIBLANGTAG"
+    BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
+    LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag"
+    if test "$COM" = "MSC"; then
+        LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
+    else
+        LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs -llangtag"
+    fi
 fi
-AC_SUBST(ENABLE_LIBLANGTAG)
 AC_SUBST(SYSTEM_LIBLANGTAG)
 AC_SUBST(LIBLANGTAG_CFLAGS)
 AC_SUBST(LIBLANGTAG_LIBS)
-- 
cgit