[src/trunk]: src/crypto/external/bsd/netpgp/dist/src Explicitly link netpgp w...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0cccb719a794
branches:  trunk
changeset: 758455:0cccb719a794
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Nov 05 07:39:59 2010 +0000

description:
Explicitly link netpgp with libmj, rather than letting libnetpgp bring it
in.

Fixes a build issue on RHEL 6.

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am     |  4 ++--
 crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r f94cd8074e0f -r 0cccb719a794 crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am    Fri Nov 05 03:37:18 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am    Fri Nov 05 07:39:59 2010 +0000
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.1 2009/06/09 00:51:03 agc Exp $
+## $NetBSD: Makefile.am,v 1.2 2010/11/05 07:39:59 agc Exp $
 
 AM_CFLAGS              = $(WARNCFLAGS)
 
@@ -8,7 +8,7 @@
 
 netpgp_CPPFLAGS                = -I$(top_srcdir)/include
 
-netpgp_LDADD           = ../lib/libnetpgp.la
+netpgp_LDADD           = ../lib/libnetpgp.la ../libmj/libmj.la
 
 man1_MANS              = netpgp.1
 
diff -r f94cd8074e0f -r 0cccb719a794 crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am        Fri Nov 05 03:37:18 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am        Fri Nov 05 07:39:59 2010 +0000
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.2 2010/11/05 03:37:19 agc Exp $
+## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:40:41 agc Exp $
 
 AM_CFLAGS              = $(WARNCFLAGS)
 
@@ -8,7 +8,7 @@
 
 netpgpkeys_CPPFLAGS    = -I$(top_srcdir)/include -I../libmj
 
-netpgpkeys_LDADD       = ../lib/libnetpgp.la
+netpgpkeys_LDADD       = ../lib/libnetpgp.la ../libmj/libmj.la
 
 man1_MANS              = netpgpkeys.1