Merge pull request #155 from edmonds/edmonds/pkg-config/libs-fixes

wcawijngaards · web-flow · commit ec9e4eb40614 · 2020-01-27T09:28:53.000+01:00
contrib/libunbound.pc.in: Fixes to Libs/Requires for crypto library dependencies
diff --git a/configure.ac b/configure.ac
@@ -761,6 +761,8 @@ AC_ARG_WITH([nss], AC_HELP_STRING([--with-nss=path],
 	fi
         LIBS="$LIBS -lnss3 -lnspr4"
 	SSLLIB=""
+	PC_CRYPTO_DEPENDENCY="nss nspr"
+	AC_SUBST(PC_CRYPTO_DEPENDENCY)
 	]
 )
 
@@ -781,6 +783,8 @@ AC_ARG_WITH([nettle], AC_HELP_STRING([--with-nettle=path],
 	fi
         LIBS="$LIBS -lhogweed -lnettle -lgmp"
 	SSLLIB=""
+	PC_CRYPTO_DEPENDENCY="hogweed nettle"
+	AC_SUBST(PC_CRYPTO_DEPENDENCY)
 	]
 )
 
@@ -790,6 +794,9 @@ ACX_WITH_SSL
 ACX_LIB_SSL
 SSLLIB="-lssl"
 
+PC_CRYPTO_DEPENDENCY="libcrypto libssl"
+AC_SUBST(PC_CRYPTO_DEPENDENCY)
+
 # check if -lcrypt32 is needed because CAPIENG needs that. (on windows)
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
diff --git a/contrib/libunbound.pc.in b/contrib/libunbound.pc.in
@@ -7,8 +7,8 @@ Name: unbound
 Description: Library with validating, recursive, and caching DNS resolver
 URL: https://www.unbound.net
 Version: @PACKAGE_VERSION@
-Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@
+Requires: @PC_CRYPTO_DEPENDENCY@ @PC_LIBEVENT_DEPENDENCY@
 Requires.private: @PC_PY_DEPENDENCY@
-Libs: -L${libdir} -lunbound -lssl -lcrypto
+Libs: -L${libdir} -lunbound
 Libs.private: @SSLLIB@ @LIBS@
-Cflags: -I${includedir} 
+Cflags: -I${includedir}

Original file line number	Diff line number	Diff line change
`@@ -761,6 +761,8 @@ AC_ARG_WITH([nss], AC_HELP_STRING([--with-nss=path],`
`761`	`761`	`fi`
`762`	`762`	`LIBS="$LIBS -lnss3 -lnspr4"`
`763`	`763`	`SSLLIB=""`
	`764`	`+ PC_CRYPTO_DEPENDENCY="nss nspr"`
	`765`	`+ AC_SUBST(PC_CRYPTO_DEPENDENCY)`
`764`	`766`	`]`
`765`	`767`	`)`
`766`	`768`
`@@ -781,6 +783,8 @@ AC_ARG_WITH([nettle], AC_HELP_STRING([--with-nettle=path],`
`781`	`783`	`fi`
`782`	`784`	`LIBS="$LIBS -lhogweed -lnettle -lgmp"`
`783`	`785`	`SSLLIB=""`
	`786`	`+ PC_CRYPTO_DEPENDENCY="hogweed nettle"`
	`787`	`+ AC_SUBST(PC_CRYPTO_DEPENDENCY)`
`784`	`788`	`]`
`785`	`789`	`)`
`786`	`790`
`@@ -790,6 +794,9 @@ ACX_WITH_SSL`
`790`	`794`	`ACX_LIB_SSL`
`791`	`795`	`SSLLIB="-lssl"`
`792`	`796`
	`797`	`+PC_CRYPTO_DEPENDENCY="libcrypto libssl"`
	`798`	`+AC_SUBST(PC_CRYPTO_DEPENDENCY)`
	`799`	`+`
`793`	`800`	`# check if -lcrypt32 is needed because CAPIENG needs that. (on windows)`
`794`	`801`	`BAKLIBS="$LIBS"`
`795`	`802`	`LIBS="-lssl $LIBS"`