summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2011-01-25 20:53:19 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2011-01-25 20:53:19 +0000
commitab43325d2a999b4b2a5cdefc100cccb71dc29b8f (patch)
tree0e10c54017e6e49d788ba3bf6c356206cda27ed2
parent498cf2dc36fa36de9644663ecf827002dd1d0d42 (diff)
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@
-rw-r--r--lib/libssl/generate_pkgconfig.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/libssl/generate_pkgconfig.sh b/lib/libssl/generate_pkgconfig.sh
index 32332a46372..4d04cc57423 100644
--- a/lib/libssl/generate_pkgconfig.sh
+++ b/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__