blob: 247e32456420d9faf693e66473c7f899ffd0574c (
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
55
56
57
58
59
60
61
62
63
64
|
rebased from original configure_madness.patch
libtasn1 provides an .pc file in upstream,
and a libgcrypt.pc is added in libgcrypt recipe,
so use Requires.private for these two.
against 2.8.6
07/02/2010 - qhe
---
diff --git a/lib/configure.ac b/lib/configure.ac
index 80d3375..1a486f7 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -81,8 +81,8 @@ fi
lgl_INIT
-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
-LIBGNUTLS_CFLAGS="-I${includedir}"
+LIBGNUTLS_LIBS="-lgnutls $LIBS"
+LIBGNUTLS_CFLAGS=""
AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(LIBGNUTLS_CFLAGS)
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 3b01c17..de31469 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -20,6 +20,6 @@ Name: GnuTLS
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@
+Requires.private: libgcrypt, libtasn1
Libs: -L${libdir} -lgnutls
-Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
Cflags: -I${includedir}
diff --git a/libextra/configure.ac b/libextra/configure.ac
index c08e73f..3313886 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
xgl_INIT
-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
+LIBGNUTLS_EXTRA_CFLAGS=""
AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
index 9e7b8f6..e228ec9 100644
--- a/libextra/gnutls-extra.pc.in
+++ b/libextra/gnutls-extra.pc.in
@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
Requires: gnutls
Version: @VERSION@
Libs: -L${libdir} -lgnutls-extra
-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
+Libs.private: -llzo2
Cflags: -I${includedir}
|
