[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Find the libmj heade...

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

details:   https://anonhg.NetBSD.org/src/rev/8a408db6e960
branches:  trunk
changeset: 758452:8a408db6e960
user:      agc <agc%NetBSD.org@localhost>
date:      Fri Nov 05 03:01:57 2010 +0000

description:
Find the libmj header file in the correct directory

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am |   6 +++-
 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in |  24 +++++++++-----------
 crypto/external/bsd/netpgp/dist/src/lib/config.h.in |   4 ---
 3 files changed, 15 insertions(+), 19 deletions(-)

diffs (128 lines):

diff -r c3f82f38083c -r 8a408db6e960 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Fri Nov 05 02:50:43 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am       Fri Nov 05 03:01:57 2010 +0000
@@ -1,10 +1,10 @@
-## $NetBSD: Makefile.am,v 1.6 2010/08/07 04:25:19 agc Exp $
+## $NetBSD: Makefile.am,v 1.7 2010/11/05 03:01:57 agc Exp $
 
 AM_CFLAGS              = $(WARNCFLAGS)
 
 lib_LTLIBRARIES                = libnetpgp.la
 
-libnetpgp_la_CPPFLAGS  = -I$(top_srcdir)/include
+libnetpgp_la_CPPFLAGS  = -I$(top_srcdir)/include -I../libmj
 
 libnetpgp_la_SOURCES   = \
        bufgap.c \
@@ -26,6 +26,8 @@
        validate.c \
        writer.c
 
+LDADD                  = ../libmj/libmj.a
+
 man3_MANS              = libnetpgp.3
 
 dist_man_MANS          = libnetpgp.3
diff -r c3f82f38083c -r 8a408db6e960 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Fri Nov 05 02:50:43 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in       Fri Nov 05 03:01:57 2010 +0000
@@ -98,43 +98,40 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
 OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -155,7 +152,8 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -186,7 +184,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -204,7 +201,7 @@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = $(WARNCFLAGS)
 lib_LTLIBRARIES = libnetpgp.la
-libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include
+libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include -I../libmj
 libnetpgp_la_SOURCES = \
        bufgap.c \
        compress.c \
@@ -225,6 +222,7 @@
        validate.c \
        writer.c
 
+LDADD = ../libmj/libmj.a
 man3_MANS = libnetpgp.3
 dist_man_MANS = libnetpgp.3
 all: config.h
diff -r c3f82f38083c -r 8a408db6e960 crypto/external/bsd/netpgp/dist/src/lib/config.h.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/config.h.in       Fri Nov 05 02:50:43 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/config.h.in       Fri Nov 05 03:01:57 2010 +0000
@@ -117,10 +117,6 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Name of package */
 #undef PACKAGE