[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac

[Michael Stahl]

 configure.ac |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 45532adc9b515411fae1bda2313c983e8a1fa0af
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 27 21:27:28 2014 +0100

    configure: do not default to system libjpeg on Linux
    
    There are multiple different sonames of libjpeg in different distros,
    so use a system one only when system libs are requested.
    
    (cherry picked from commit 20d1e20d16ac377c160d47b53ff487a75fbd166f)
    
    Conflicts:
    	configure.ac
    
    Change-Id: I164433a31ab0fb4723da6843eb1f1132c8447d9e
    Reviewed-on: https://gerrit.libreoffice.org/13157
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 122928d..d4cf1a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1554,7 +1554,7 @@ AC_ARG_WITH(system-zlib,
 AC_ARG_WITH(system-jpeg,
     AS_HELP_STRING([--with-system-jpeg],
         [Use jpeg already on system.]),,
-    [with_system_jpeg=auto])
+    [with_system_jpeg="$with_system_libs"])
 
 AC_ARG_WITH(system-libgltf,
     AS_HELP_STRING([--with-system-libgltf],
@@ -7650,18 +7650,6 @@ AC_SUBST(SYSTEM_ZLIB)
 dnl ===================================================================
 dnl Check for system jpeg
 dnl ===================================================================
-AC_MSG_CHECKING([which jpeg to use])
-if test "$with_system_jpeg" = "auto"; then
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        with_system_jpeg="$with_system_libs"
-        ;;
-    *)
-        with_system_jpeg=yes
-        ;;
-    esac
-fi
-
 if test "$with_system_jpeg" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_JPEG=TRUE