Module Name: src
Committed By: agc
Date: Fri Nov 5 03:01:57 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in
config.h.in
Log Message:
Find the libmj header file in the correct directory
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
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/lib/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.6 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.6 Sat Aug 7 04:25:19 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Fri Nov 5 03:01:57 2010
@@ -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
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.10 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.11
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.10 Thu Nov 4 15:38:45 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Fri Nov 5 03:01:57 2010
@@ -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
Index: src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.12 src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.13
--- src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in:1.12 Thu Nov 4 15:38:45 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/config.h.in Fri Nov 5 03:01:57 2010
@@ -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
