[Libreoffice-commits] online.git: 2 commits - configure.ac

[Libreoffice Gerrit user]

 configure.ac |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit db5a57308ba8d0a9be903c04ab05bd7df74c3d1a
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jun 7 21:16:19 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 20 13:15:00 2018 +0300

    Look for libpng16, too, and link with -lz (in case static build)

diff --git a/configure.ac b/configure.ac
index c5c5200d0..f7b94f9b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,9 +283,10 @@ AS_IF([test `uname -s` != Darwin],
                       [AC_MSG_ERROR([dlopen not found])])])
 
 AC_SEARCH_LIBS([png_create_write_struct],
-               [png],
+               [png png16],
                [],
-               [AC_MSG_ERROR([libpng not available?])])
+               [AC_MSG_ERROR([libpng not available?])],
+               [-lz])
 
 AS_IF([test `uname -s` = Linux],
       [AC_SEARCH_LIBS([cap_get_proc],
commit 574f769317dfb09f86a1b145eb2209969c5f2232
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jun 7 19:59:34 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 20 13:15:00 2018 +0300

    Hopefully just 'readlink' (without the -f option) is enough

diff --git a/configure.ac b/configure.ac
index 421fdd686..c5c5200d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,7 @@ else
     AC_MSG_ERROR(no)
 fi
 
-with_lokit_path=`readlink -f $with_lokit_path`
+with_lokit_path=`readlink $with_lokit_path`
 AS_IF([test -n "$with_lokit_path"],
       [CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
 lokit_msg="$with_lokit_path"