Module Name: src
Committed By: agc
Date: Fri Nov 5 07:40:41 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.am
Log Message:
Explicitly link netpgp with libmj, rather than letting libnetpgp bring it
in.
Fixes a build issue on RHEL 6.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.2 Fri Nov 5 03:37:19 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am Fri Nov 5 07:40:41 2010
@@ -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
