- Fix #1117: libunbound.pc sets strange Libs, Libs.private values.

git-svn-id: file:///svn/unbound/trunk@3889 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 0a439477e9f7144c301b59337039a19e0ec40c9c..709556595bdd1a971c39f46f43845f9aadbecba3 100755 (executable)
--- a/configure
+++ b/configure
@@ -659,6 +659,7 @@ WINAPPS
 WINDRES
 CHECKLOCK_OBJ
 staticexe
+PC_LIBEVENT_DEPENDENCY
 UNBOUND_EVENT_UNINSTALL
 UNBOUND_EVENT_INSTALL
 SSLLIB
@@ -678,6 +679,7 @@ WITH_PYTHONMODULE
 swig
 SWIG_LIB
 SWIG
+PC_PY_DEPENDENCY
 PY_MAJOR_VERSION
 PYTHON_SITE_PKG
 PYTHON_LDFLAGS
@@ -16824,6 +16826,8 @@ $as_echo "#define HAVE_PYTHON 1" >>confdefs.h
       LIBS="$PYTHON_LDFLAGS $LIBS"
       CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
       ub_have_python=yes
+      PC_PY_DEPENDENCY="python"
+
 
       # Check for SWIG
       ub_have_swig=no
@@ -18379,6 +18383,8 @@ _ACEOF
 fi
 done
  # only in libev. (tested on 4.00)
+        PC_LIBEVENT_DEPENDENCY="libevent"
+
        if test -n "$BAK_LDFLAGS_SET"; then
                LDFLAGS="$BAK_LDFLAGS"
        fi

diff --git a/configure.ac b/configure.ac
index 514b82c61da25226231115ada65bb43411e05c4a..98cacecb213a45514393c70734ff64ad1eb8f8bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -544,6 +544,8 @@ if test x_$ub_test_python != x_no; then
       LIBS="$PYTHON_LDFLAGS $LIBS"
       CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
       ub_have_python=yes
+      PC_PY_DEPENDENCY="python"
+      AC_SUBST(PC_PY_DEPENDENCY)
 
       # Check for SWIG
       ub_have_swig=no
@@ -1001,6 +1003,8 @@ large outgoing port ranges.  ])
        AC_CHECK_FUNCS([event_base_get_method]) # only in libevent 1.4.3 and later
        AC_CHECK_FUNCS([ev_loop]) # only in libev. (tested on 3.51)
        AC_CHECK_FUNCS([ev_default_loop]) # only in libev. (tested on 4.00)
+        PC_LIBEVENT_DEPENDENCY="libevent"
+        AC_SUBST(PC_LIBEVENT_DEPENDENCY)
        if test -n "$BAK_LDFLAGS_SET"; then
                LDFLAGS="$BAK_LDFLAGS"
        fi

diff --git a/contrib/libunbound.pc.in b/contrib/libunbound.pc.in
index c0d1286401cc3aeb99819b7bd9cb547d018b6822..130bef520372fdd65e14d9e7ff7b4d2d6458a1fc 100644 (file)
--- a/contrib/libunbound.pc.in
+++ b/contrib/libunbound.pc.in
@@ -7,7 +7,7 @@ Name: unbound
 Description: Library with validating, recursive, and caching DNS resolver
 URL: http://www.unbound.net
 Version: @PACKAGE_VERSION@
-Requires: 
-Libs: -L${libdir} -lunbound @SSLLIB@ @LIBS@
-Libs.private: @LDFLAGS@
+Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@ @PC_PY_DEPENDENCY@
+Libs: -L${libdir} -lunbound
+Libs.private: @SSLLIB@ @LIBS@
 Cflags: -I${includedir} 

diff --git a/doc/Changelog b/doc/Changelog
index da98aeab65509cc5a13832584e861193b695da94..aa7e825469f56ac4aa0123104a07c0e1dcc770ca 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
          from Jinmei Tatuya (Infoblox).
        - Fix #1125: unbound could reuse an answer packet incorrectly for
          clients with different EDNS parameters, from Jinmei Tatuya.
+       - Fix #1117: libunbound.pc sets strange Libs, Libs.private values.
 
 17 October 2016: Wouter
        - Re-fix #839 from view commit overwrite.