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

[Libreoffice Gerrit user]

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

New commits:
commit fc9f722a46f2f4a467f6bf0250161b81fd9d9640
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Aug 20 17:59:31 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Aug 20 17:59:31 2018 +0300

    Revert "Look for libpng16, too, and link with -lz (in case static build)"
    
    Nah. Let's not pretend. The configure script approach is for Linux
    only.
    
    This reverts commit db5a57308ba8d0a9be903c04ab05bd7df74c3d1a.

diff --git a/configure.ac b/configure.ac
index 2822e6fe5..421fdd686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,10 +283,9 @@ AS_IF([test `uname -s` != Darwin],
                       [AC_MSG_ERROR([dlopen not found])])])
 
 AC_SEARCH_LIBS([png_create_write_struct],
-               [png png16],
+               [png],
                [],
-               [AC_MSG_ERROR([libpng not available?])],
-               [-lz])
+               [AC_MSG_ERROR([libpng not available?])])
 
 AS_IF([test `uname -s` = Linux],
       [AC_SEARCH_LIBS([cap_get_proc],
commit a03512009584277ae7789bdf49d2f527a89d6622
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Aug 20 17:59:06 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Aug 20 17:59:06 2018 +0300

    Revert "Hopefully just 'readlink' (without the -f option) is enough"
    
    Nah. Let's not pretend. The configure script approach is for Linux
    only.
    
    This reverts commit 574f769317dfb09f86a1b145eb2209969c5f2232.

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