From 3e4e9052238c7842bcccc5bc4e99c4fb560e5fa2 Mon Sep 17 00:00:00 2001 From: naddy <> Date: Tue, 25 Jan 2011 20:53:18 +0000 Subject: Put -I${includedir} back into Cflags so configure script tests like test -n "`pkg-config --cflags openssl`" don't assume that OpenSSL isn't available. ok miod@, sthen@, ajacoutot@, djm@ --- src/lib/libssl/generate_pkgconfig.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/libssl/generate_pkgconfig.sh b/src/lib/libssl/generate_pkgconfig.sh index 32332a4637..4d04cc5742 100644 --- a/src/lib/libssl/generate_pkgconfig.sh +++ b/src/lib/libssl/generate_pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: generate_pkgconfig.sh,v 1.3 2011/01/21 09:24:46 jasper Exp $ +# $OpenBSD: generate_pkgconfig.sh,v 1.4 2011/01/25 20:53:18 naddy Exp $ # # Generate pkg-config files for OpenSSL. @@ -39,6 +39,10 @@ fi ssl_version=$(sed -nE 's/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+"(.*)".*/\1/p' \ ${curdir}/src/crypto/opensslv.h) +# Put -I${includedir} into Cflags so configure script tests like +# test -n "`pkg-config --cflags openssl`" +# don't assume that OpenSSL isn't available. + pc_file="${objdir}/libcrypto.pc" cat > ${pc_file} << __EOF__ prefix=/usr @@ -51,7 +55,7 @@ Description: OpenSSL cryptography library Version: ${ssl_version} Requires: Libs: -lcrypto -Cflags: +Cflags: -I\${includedir} __EOF__ @@ -67,7 +71,7 @@ Description: Secure Sockets Layer and cryptography libraries Version: ${ssl_version} Requires: Libs: -lssl -lcrypto -Cflags: +Cflags: -I\${includedir} __EOF__ @@ -83,5 +87,5 @@ Description: Secure Sockets Layer and cryptography libraries and tools Version: ${ssl_version} Requires: Libs: -lssl -lcrypto -Cflags: +Cflags: -I\${includedir} __EOF__ -- cgit v1.2.3-55-g6feb