blob: 25436b2200acc16fe417b8c7481bedab3f3b5999 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
This file is part of MXE.
See index.html for further information.
From 29cb19fb27ec834473d638fb13a947e0e004116d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 12 Apr 2015 10:07:58 +0200
Subject: [PATCH] Revert "Include private dependencies automatically in
pkg-config for non-shared builds"
This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413.
diff --git a/configure.ac b/configure.ac
index 5a16151..e6cd467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -803,10 +803,8 @@ fi
if test "x$enable_shared" = xyes ; then
IF_SHARED=''
- IF_NOT_SHARED='#'
else
IF_SHARED='#'
- IF_NOT_SHARED=''
fi
# Documentation tools
@@ -840,7 +838,6 @@ fi
AC_SUBST(IF_HOGWEED)
AC_SUBST(IF_STATIC)
AC_SUBST(IF_SHARED)
-AC_SUBST(IF_NOT_SHARED)
AC_SUBST(IF_DOCUMENTATION)
AC_SUBST(IF_DLL)
AC_SUBST(IF_MINI_GMP)
diff --git a/hogweed.pc.in b/hogweed.pc.in
index 97fb9d4..839f7d0 100644
--- a/hogweed.pc.in
+++ b/hogweed.pc.in
@@ -11,9 +11,8 @@ Name: Hogweed
Description: Nettle low-level cryptographic library (public-key algorithms)
URL: http://www.lysator.liu.se/~nisse/nettle
Version: @PACKAGE_VERSION@
-Requires: @IF_NOT_SHARED@ nettle
-Requires.private: @IF_SHARED@ nettle
-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
-Libs.private: @IF_SHARED@ @LIBS@
+Requires.private: nettle
+Libs: -L${libdir} -lhogweed
+Libs.private: @LIBS@
Cflags: -I${includedir}
--
2.1.4
|
