From 12400475283f5081ea55f52a764e43f14032f6ba Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 22 Jun 2019 14:11:58 -0400
Subject: Try to use pkg-config to find external dependencies (fixes #324)

---
 configure.ac | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 9cb99184..be34700c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,11 +163,39 @@ fi
 AC_SUBST(IS_32BIT)
 AC_SUBST(WINDOWS_WORDSIZE)
 
+PKG_PROG_PKG_CONFIG
 if test "$BUILD_INTERNAL_LIBS" = "0"; then
-   AC_CHECK_HEADER(zlib.h,,[MISSING_ZLIB_H=1; MISSING_ANY=1])
-   AC_SEARCH_LIBS(deflate,z zlib,,[MISSING_ZLIB=1; MISSING_ANY=1])
-   AC_CHECK_HEADER(jpeglib.h,,[MISSING_JPEG_H=1; MISSING_ANY=1])
-   AC_SEARCH_LIBS(jpeg_destroy,jpeg,,[MISSING_JPEG=1; MISSING_ANY=1])
+    if test "$PKG_CONFIG" != ""; then
+       PKG_CHECK_MODULES([pc_zlib], [zlib],
+         [CFLAGS="$CFLAGS $pc_zlib_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_zlib_CXXFLAGS"
+          LIBS="$LIBS $pc_zlib_LIBS"
+         ], [:])
+       PKG_CHECK_MODULES([pc_libjpeg], [libjpeg],
+         [CFLAGS="$CFLAGS $pc_libjpeg_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $pc_libjpeg_CXXFLAGS"
+          LIBS="$LIBS $pc_libjpeg_LIBS"
+         ],[:])
+    fi
+    if test "$pc_zlib_LIBS" = ""; then
+        AC_CHECK_HEADER(zlib.h,,[MISSING_ZLIB_H=1; MISSING_ANY=1])
+        AC_SEARCH_LIBS(deflate,z zlib,,[MISSING_ZLIB=1; MISSING_ANY=1])
+    fi
+    if test "$pc_libjpeg_LIBS" = ""; then
+        AC_CHECK_HEADER(jpeglib.h,,[MISSING_JPEG_H=1; MISSING_ANY=1])
+        AC_SEARCH_LIBS(jpeg_destroy,jpeg,,[MISSING_JPEG=1; MISSING_ANY=1])
+    fi
+    if test "$LIBS" != ""; then
+        nLIBS=""
+        for x in $LIBS; do
+            if echo $x | grep -q '^-L'; then
+                LDFLAGS="$LDFLAGS $x"
+            else
+                nLIBS="$nLIBS $x"
+            fi
+            LIBS=$nLIBS
+        done
+    fi
 fi
 
 qpdf_USE_WMAIN=0
-- 
cgit v1.2.3-54-g00ecf