From cc858aca0ebf653eebceaf09e2316763d8d81051 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 8 May 2013 17:10:37 +0200
Subject: configure: substantially de-bong libpng handling

- remove --unix-qstart-libpng:
  the internal libpng is static lib so this option is pointless
- clean up duplicative libpng checks
- replace usage of ENABLE_QUICKSTART_LIBPNG with ENABLE_HEADLESS,
  which is the one case where it could still be disabled

Change-Id: Ie2e2c7e4a2396572742fdf056bf23c4271f04811
---
 config_host.mk.in              |  1 -
 configure.ac                   | 55 +-----------------------------------------
 desktop/Executable_oosplash.mk |  2 +-
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 7e469aae7616..6e5e0cdca163 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
-export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
 export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_READONLY_INSTALLSET=@ENABLE_READONLY_INSTALLSET@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
diff --git a/configure.ac b/configure.ac
index b8e0961b837f..50617558fc2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,13 +979,6 @@ AC_ARG_ENABLE(headless,
         server usage. Work in progress, use only if you are hacking on
         it. Not related to the --headless option.]), ,)
 
-AC_ARG_ENABLE(unix-qstart-libpng,
-    AS_HELP_STRING([--disable-unix-qstart-libpng],
-        [On UNIX systems, we have a faster splash app, that can use libpng to
-         render its splash, if we can safely link to the system libpng then
-         enabling this is a good idea (ie. for Linux Distro packaging).]),
-,enable_unix_qstart_libpng=yes)
-
 AC_ARG_ENABLE(rpath,
     AS_HELP_STRING([--disable-rpath],
         [Disable the use of relative paths in shared libraries.]),
@@ -1650,11 +1643,6 @@ AC_ARG_WITH(system-npapi-headers,
     [with_system_npapi_headers="$with_system_headers"]
 )
 
-AC_ARG_WITH(system-libpng,
-    AS_HELP_STRING([--with-system-libpng],
-        [Use libpng already on system.]),,
-    [with_system_libpng=auto])
-
 AC_ARG_WITH(linker-hash-style,
     AS_HELP_STRING([--with-linker-hash-style],
         [Use linker with --hash-style=<style> when linking shared objects.
@@ -4330,7 +4318,6 @@ if test "$enable_headless" = "yes"; then
     test_tde=no
     test_kde=no
     test_kde4=no
-    enable_unix_qstart_libpng=no
     enable_cairo_canvas=no
     enable_gnome_vfs=no
 fi
@@ -9536,21 +9523,6 @@ AC_SUBST(TELEPATHY_LIBS)
 
 dnl ===================================================================
 
-if test "$enable_headless" != "yes"; then
-    PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
-fi
-AC_SUBST(LIBPNG_LIBS)
-AC_SUBST(LIBPNG_CFLAGS)
-
-AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test "x$enable_unix_qstart_libpng" != "xno"; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-    ENABLE_QUICKSTART_LIBPNG=""
-fi
-AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-
 SPLIT_APP_MODULES=""
 if test "$enable_split_app_modules" = "yes"; then
     SPLIT_APP_MODULES="YES"
@@ -11085,32 +11057,7 @@ dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 
-AC_MSG_CHECKING([whether to use the system libpng])
-
-dnl How should and does this interact with the checks for libpng
-dnl related to use of libpng in the quickstarter above? This needs to
-dnl be unified.
-
-if test "$with_system_libpng" = "auto"; then
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        with_system_libpng="$with_system_libs"
-        ;;
-    *)
-        with_system_libpng=yes
-        ;;
-    esac
-fi
-
-if test "$with_system_libpng" = yes; then
-    SYSTEM_LIBPNG=YES
-    AC_MSG_RESULT([yes])
-else
-    SYSTEM_LIBPNG=NO
-    BUILD_TYPE="$BUILD_TYPE LIBPNG"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(SYSTEM_LIBPNG)
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lpng"])
 
 dnl ===================================================================
 dnl Check for runtime JVM search path
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 78112b8c09fe..51657fe40d9f 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\
 endif
 endif
 
-ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE)
+ifneq ($(ENABLE_HEADLESS),TRUE)
 
 $(eval $(call gb_Executable_add_defs,oosplash,\
     -DENABLE_QUICKSTART_LIBPNG \
-- 
cgit