From 623a64f2c96b71f8609eccb81cb04886ae390c7b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 19 Jan 2017 16:08:43 +0300
Subject: Dump on startup linked and loaded lib versions.

For now only zlib supported.
Also detect zlib by pkgconfig in configure.
---
 configure.ac | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 0257e96cc..b6655bd6e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,13 @@ AC_TYPE_UINT32_T
 AC_TYPE_INT64_T
 AC_TYPE_SSIZE_T
 
+# Search for *-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
+AC_PATH_PROG(CURL_CONFIG, curl-config)
+
+LIBS="$LIBS `$PKG_CONFIG --libs zlib`"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags zlib`"
+
 # Checks for internationalization support
 AM_GNU_GETTEXT([external],[need-ngettext])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -192,10 +199,6 @@ if test "x$naclbuild_enabled" == "xfalse"; then
     AC_CHECK_SDL()
 fi
 
-# Search for *-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config)
-AC_PATH_PROG(CURL_CONFIG, curl-config)
-
 # Checks for libraries
 AC_ARG_WITH(pthread,[  --without-pthread        don't check for pthread ] )
 if test "x$with_pthread" == "xno"; then
@@ -544,6 +547,10 @@ AC_OUTPUT
 
 echo
 echo "Build with OpenGL: $with_opengl"
+echo
+echo "LIBS: $LIBS"
+echo "CPPFLAGS: $CPPFLAGS"
+
 echo
 echo "configure complete, now type \"make\""
 echo
-- 
cgit v1.2.3-60-g2f50