[src/trunk]: src/crypto/external/bsd/netpgp/dist specify the libmj.la archive...

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

details:   https://anonhg.NetBSD.org/src/rev/3c615e4c9321
branches:  trunk
changeset: 758489:3c615e4c9321
user:      agc <agc%NetBSD.org@localhost>
date:      Sat Nov 06 03:42:59 2010 +0000

description:
specify the libmj.la archive as a pre-req for libnetpgp.la in the
correct way - tested on RHEL 6 and Mac OS X.

diffstat:

 crypto/external/bsd/netpgp/dist/configure           |  2 +-
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am |  4 ++--
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in |  4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r d4252c666647 -r 3c615e4c9321 crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Sat Nov 06 01:25:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Sat Nov 06 03:42:59 2010 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.38 .
+# From configure.ac Revision: 1.39 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63 for netpgp 20101105.
 #
diff -r d4252c666647 -r 3c615e4c9321 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Sat Nov 06 01:25:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Sat Nov 06 03:42:59 2010 +0000
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.8 2010/11/06 00:03:32 agc Exp $
+## $NetBSD: Makefile.am,v 1.9 2010/11/06 03:42:59 agc Exp $
 
 AM_CFLAGS              = $(WARNCFLAGS)
 
@@ -26,6 +26,6 @@
        validate.c \
        writer.c
 
-LDADD                  = ../libmj/libmj.a
+libnetpgp_la_LIBADD    = ../libmj/libmj.la
 
 dist_man_MANS          = libnetpgp.3
diff -r d4252c666647 -r 3c615e4c9321 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Sat Nov 06 01:25:32 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Sat Nov 06 03:42:59 2010 +0000
@@ -52,7 +52,7 @@
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libnetpgp_la_LIBADD =
+libnetpgp_la_DEPENDENCIES = ../libmj/libmj.la
 am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \
        libnetpgp_la-compress.lo libnetpgp_la-create.lo \
        libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
@@ -225,7 +225,7 @@
        validate.c \
        writer.c
 
-LDADD = ../libmj/libmj.a
+libnetpgp_la_LIBADD = ../libmj/libmj.la
 dist_man_MANS = libnetpgp.3
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am