Module Name: src
Committed By: lukem
Date: Tue May 26 05:47:33 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: configure
src/crypto/external/bsd/netpgp/dist/include: Makefile.in
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in
Log Message:
regenerate
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/include/Makefile.in
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.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/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.13 src/crypto/external/bsd/netpgp/dist/configure:1.14
--- src/crypto/external/bsd/netpgp/dist/configure:1.13 Tue May 26 05:03:57 2009
+++ src/crypto/external/bsd/netpgp/dist/configure Tue May 26 05:47:32 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.12 .
+# From configure.ac Revision: 1.14 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for netpgp 20090525.
#
@@ -21834,8 +21834,16 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#if defined(HAVE_SYS_TYPES_H)
#include <sys/types.h>
+#endif
+#if defined(HAVE_OPENSSL_SHA_H)
#include <openssl/sha.h>
+#endif
+#if defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
+#define COMMON_DIGEST_FOR_OPENSSL 1
+#include <CommonCrypto/CommonDigest.h>
+#endif
int
@@ -21872,8 +21880,16 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#if defined(HAVE_SYS_TYPES_H)
#include <sys/types.h>
+#endif
+#if defined(HAVE_OPENSSL_SHA_H)
#include <openssl/sha.h>
+#endif
+#if defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
+#define COMMON_DIGEST_FOR_OPENSSL 1
+#include <CommonCrypto/CommonDigest.h>
+#endif
int
Index: src/crypto/external/bsd/netpgp/dist/include/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.1 src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.2
--- src/crypto/external/bsd/netpgp/dist/include/Makefile.in:1.1 Tue May 26 04:27:29 2009
+++ src/crypto/external/bsd/netpgp/dist/include/Makefile.in Tue May 26 05:47:32 2009
@@ -33,7 +33,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = include
-DIST_COMMON = $(netpgpinc_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50,9 +50,9 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(netpgpincdir)"
-netpgpincHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(netpgpinc_HEADERS)
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -169,8 +169,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-netpgpincdir = $(includedir)
-netpgpinc_HEADERS = netpgp.h
+include_HEADERS = netpgp.h
all: all-am
.SUFFIXES:
@@ -209,22 +208,22 @@
clean-libtool:
-rm -rf .libs _libs
-install-netpgpincHEADERS: $(netpgpinc_HEADERS)
+install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(netpgpincdir)" || $(MKDIR_P) "$(DESTDIR)$(netpgpincdir)"
- @list='$(netpgpinc_HEADERS)'; for p in $$list; do \
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(netpgpincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(netpgpincdir)/$$f'"; \
- $(netpgpincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(netpgpincdir)/$$f"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
done
-uninstall-netpgpincHEADERS:
+uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(netpgpinc_HEADERS)'; for p in $$list; do \
+ @list='$(include_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(netpgpincdir)/$$f'"; \
- rm -f "$(DESTDIR)$(netpgpincdir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -304,7 +303,7 @@
check: check-am
all-am: Makefile $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(netpgpincdir)"; do \
+ for dir in "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -349,7 +348,7 @@
info-am:
-install-data-am: install-netpgpincHEADERS
+install-data-am: install-includeHEADERS
install-dvi: install-dvi-am
@@ -383,7 +382,7 @@
ps-am:
-uninstall-am: uninstall-netpgpincHEADERS
+uninstall-am: uninstall-includeHEADERS
.MAKE: install-am install-strip
@@ -392,13 +391,13 @@
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-netpgpincHEADERS \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-netpgpincHEADERS
+ install-exec-am install-html install-html-am \
+ install-includeHEADERS install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.3 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.4
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.3 Tue May 26 04:27:29 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Tue May 26 05:47:33 2009
@@ -33,8 +33,8 @@
build_triplet = @build@
host_triplet = @host@
subdir = src/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in mkinstalldirs
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -48,7 +48,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libnetpgp_la_LIBADD =
@@ -61,9 +61,6 @@
libnetpgp_la-signature.lo libnetpgp_la-symmetric.lo \
libnetpgp_la-validate.lo libnetpgp_la-writer.lo
libnetpgp_la_OBJECTS = $(am_libnetpgp_la_OBJECTS)
-libnetpgp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libnetpgp_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -...@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -78,6 +75,9 @@
$(LDFLAGS) -o $@
SOURCES = $(libnetpgp_la_SOURCES)
DIST_SOURCES = $(libnetpgp_la_SOURCES)
+man3dir = $(mandir)/man3
+NROFF = nroff
+MANS = $(dist_man_MANS) $(man3_MANS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -196,7 +196,6 @@
top_srcdir = @top_srcdir@
AM_CFLAGS = $(WARNCFLAGS)
lib_LTLIBRARIES = libnetpgp.la
-libnetpgp_la_LDFLAGS = -static
libnetpgp_la_CPPFLAGS = -I$(top_srcdir)/include
libnetpgp_la_SOURCES = \
compress.c \
@@ -215,6 +214,8 @@
validate.c \
writer.c
+man3_MANS = libnetpgp.3
+dist_man_MANS = libnetpgp.3
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -294,7 +295,7 @@
rm -f "$${dir}/so_locations"; \
done
libnetpgp.la: $(libnetpgp_la_OBJECTS) $(libnetpgp_la_DEPENDENCIES)
- $(libnetpgp_la_LINK) -rpath $(libdir) $(libnetpgp_la_OBJECTS) $(libnetpgp_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libnetpgp_la_OBJECTS) $(libnetpgp_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -449,6 +450,51 @@
clean-libtool:
-rm -rf .libs _libs
+install-man3: $(man3_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+uninstall-man3:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -525,9 +571,9 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) config.h
+all-am: Makefile $(LTLIBRARIES) $(MANS) config.h
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -575,7 +621,7 @@
info-am:
-install-data-am:
+install-data-am: install-man
install-dvi: install-dvi-am
@@ -585,7 +631,7 @@
install-info: install-info-am
-install-man:
+install-man: install-man3
install-pdf: install-pdf-am
@@ -611,7 +657,9 @@
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES uninstall-man
+
+uninstall-man: uninstall-man3
.MAKE: install-am install-strip
@@ -622,12 +670,14 @@
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
- install-info-am install-libLTLIBRARIES install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libLTLIBRARIES
+ install-info-am install-libLTLIBRARIES install-man \
+ install-man3 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-libLTLIBRARIES uninstall-man \
+ uninstall-man3
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
