diff options
author | naddy <> | 2011-01-25 20:53:18 +0000 |
---|---|---|
committer | naddy <> | 2011-01-25 20:53:18 +0000 |
commit | 3e4e9052238c7842bcccc5bc4e99c4fb560e5fa2 (patch) | |
tree | 5d031cb2f1ba45de83b14b4d6793fd079b37922d /src/lib/libssl/generate_pkgconfig.sh | |
parent | b9af7d3e39bdc24692437678d37638c8728737b9 (diff) | |
download | openbsd-3e4e9052238c7842bcccc5bc4e99c4fb560e5fa2.tar.gz openbsd-3e4e9052238c7842bcccc5bc4e99c4fb560e5fa2.tar.bz2 openbsd-3e4e9052238c7842bcccc5bc4e99c4fb560e5fa2.zip |
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@
Diffstat (limited to 'src/lib/libssl/generate_pkgconfig.sh')
-rw-r--r-- | src/lib/libssl/generate_pkgconfig.sh | 12 |
1 files 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $OpenBSD: generate_pkgconfig.sh,v 1.3 2011/01/21 09:24:46 jasper Exp $ | 3 | # $OpenBSD: generate_pkgconfig.sh,v 1.4 2011/01/25 20:53:18 naddy Exp $ |
4 | # | 4 | # |
5 | # Generate pkg-config files for OpenSSL. | 5 | # Generate pkg-config files for OpenSSL. |
6 | 6 | ||
@@ -39,6 +39,10 @@ fi | |||
39 | ssl_version=$(sed -nE 's/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+"(.*)".*/\1/p' \ | 39 | ssl_version=$(sed -nE 's/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+"(.*)".*/\1/p' \ |
40 | ${curdir}/src/crypto/opensslv.h) | 40 | ${curdir}/src/crypto/opensslv.h) |
41 | 41 | ||
42 | # Put -I${includedir} into Cflags so configure script tests like | ||
43 | # test -n "`pkg-config --cflags openssl`" | ||
44 | # don't assume that OpenSSL isn't available. | ||
45 | |||
42 | pc_file="${objdir}/libcrypto.pc" | 46 | pc_file="${objdir}/libcrypto.pc" |
43 | cat > ${pc_file} << __EOF__ | 47 | cat > ${pc_file} << __EOF__ |
44 | prefix=/usr | 48 | prefix=/usr |
@@ -51,7 +55,7 @@ Description: OpenSSL cryptography library | |||
51 | Version: ${ssl_version} | 55 | Version: ${ssl_version} |
52 | Requires: | 56 | Requires: |
53 | Libs: -lcrypto | 57 | Libs: -lcrypto |
54 | Cflags: | 58 | Cflags: -I\${includedir} |
55 | __EOF__ | 59 | __EOF__ |
56 | 60 | ||
57 | 61 | ||
@@ -67,7 +71,7 @@ Description: Secure Sockets Layer and cryptography libraries | |||
67 | Version: ${ssl_version} | 71 | Version: ${ssl_version} |
68 | Requires: | 72 | Requires: |
69 | Libs: -lssl -lcrypto | 73 | Libs: -lssl -lcrypto |
70 | Cflags: | 74 | Cflags: -I\${includedir} |
71 | __EOF__ | 75 | __EOF__ |
72 | 76 | ||
73 | 77 | ||
@@ -83,5 +87,5 @@ Description: Secure Sockets Layer and cryptography libraries and tools | |||
83 | Version: ${ssl_version} | 87 | Version: ${ssl_version} |
84 | Requires: | 88 | Requires: |
85 | Libs: -lssl -lcrypto | 89 | Libs: -lssl -lcrypto |
86 | Cflags: | 90 | Cflags: -I\${includedir} |
87 | __EOF__ | 91 | __EOF__ |