[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac external/jpeg-turbo RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk                    |    2 +-
 config_host.mk.in                        |    1 -
 configure.ac                             |    2 --
 external/jpeg-turbo/Module_jpeg-turbo.mk |    4 ----
 4 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 2d6ee4ef812f8ac51c0a07fc4e44e54593a90fa6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 3 08:26:17 2014 +0100

    WITH_JPEG_TURBO redundant with BUILD_TYPE JPEG_TURBO
    
    Change-Id: If918b3083fcd8c2e2ea41c43cba53ded1a207196

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f2af5fc..3ae0eb6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -455,7 +455,7 @@ $(call gb_LinkTarget_set_ldflags,$(1),\
 
 endef
 
-else ifeq ($(WITH_JPEG_TURBO),TRUE)
+else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),)
 
 define gb_LinkTarget__use_jpeg
 $(call gb_LinkTarget_set_include,$(1),\
diff --git a/config_host.mk.in b/config_host.mk.in
index 13639e8..9224237 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -620,7 +620,6 @@ export WITH_FONTS=@WITH_FONTS@
 export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@
 export WITH_GSSAPI=@WITH_GSSAPI@
 export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
-export WITH_JPEG_TURBO=@WITH_JPEG_TURBO@
 export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
diff --git a/configure.ac b/configure.ac
index 3be712e..7740f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7360,7 +7360,6 @@ else
     SYSTEM_JPEG=
     if test "$with_jpeg_turbo" = "yes"; then
         AC_MSG_RESULT([internal, jpeg-turbo])
-        WITH_JPEG_TURBO=TRUE
         BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
         AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
         if test -z "$NASM" -a "$build_os" = "cygwin" -a -x "/opt/lo/bin/nasm"; then
@@ -7406,7 +7405,6 @@ _EOS
 fi
 AC_SUBST(NASM)
 AC_SUBST(SYSTEM_JPEG)
-AC_SUBST(WITH_JPEG_TURBO)
 
 dnl ===================================================================
 dnl Check for system clucene
commit 0e87fc5ce79a27ca74515f5cacee43288206ca0c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 3 08:25:40 2014 +0100

    Redundant WITH_JPEG_TURBO check
    
    ...already covered in external/Module_external.mk
    
    Change-Id: Ieebb376a7509135c6102ec2c7433a815ec679b6c

diff --git a/external/jpeg-turbo/Module_jpeg-turbo.mk b/external/jpeg-turbo/Module_jpeg-turbo.mk
index 87cd247..20899f5 100644
--- a/external/jpeg-turbo/Module_jpeg-turbo.mk
+++ b/external/jpeg-turbo/Module_jpeg-turbo.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,jpeg-turbo))
 
-ifeq ($(WITH_JPEG_TURBO),TRUE)
-
 $(eval $(call gb_Module_add_targets,jpeg-turbo,\
 	ExternalProject_jpeg-turbo \
 	UnpackedTarball_jpeg-turbo \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4: