upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: file:///svn/unbound/trunk@3889 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-10-18 13:56:42 +00:00
parent 365a5666f3
commit 63d4bcde56
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

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

4
configure.ac
View file

@ -544,6 +544,8 @@ if test x_$ub_test_python != x_no; then
LIBS="$PYTHON_LDFLAGS $LIBS" LIBS="$PYTHON_LDFLAGS $LIBS"
CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
ub_have_python=yes ub_have_python=yes
PC_PY_DEPENDENCY="python"
AC_SUBST(PC_PY_DEPENDENCY)
# Check for SWIG # Check for SWIG
ub_have_swig=no 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([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_loop]) # only in libev. (tested on 3.51)
AC_CHECK_FUNCS([ev_default_loop]) # only in libev. (tested on 4.00) 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 if test -n "$BAK_LDFLAGS_SET"; then
LDFLAGS="$BAK_LDFLAGS" LDFLAGS="$BAK_LDFLAGS"
fi fi

6
contrib/libunbound.pc.in
View file

@ -7,7 +7,7 @@ Name: unbound
Description: Library with validating, recursive, and caching DNS resolver Description: Library with validating, recursive, and caching DNS resolver
URL: http://www.unbound.net URL: http://www.unbound.net
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@ @PC_PY_DEPENDENCY@
Libs: -L${libdir} -lunbound @SSLLIB@ @LIBS@ Libs: -L${libdir} -lunbound
Libs.private: @LDFLAGS@ Libs.private: @SSLLIB@ @LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}

1
doc/Changelog
View file

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