From 0d85ad6ad76be15d7c8209875f656f4e7cb57606 Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 5 May 2009 15:29:46 +0000 Subject: [PATCH] Don't bother searching for assert.h, it's not needed any more --- crypto/external/bsd/netpgp/dist/configure | 23 +++++++++---------- crypto/external/bsd/netpgp/dist/configure.ac | 4 ++-- .../external/bsd/netpgp/dist/src/lib/config.h | 5 +--- .../bsd/netpgp/dist/src/lib/config.h.in | 3 --- .../external/bsd/netpgp/dist/src/lib/netpgp.c | 4 ---- .../bsd/netpgp/dist/src/lib/packet-parse.c | 4 ---- .../bsd/netpgp/dist/src/lib/validate.c | 4 ---- 7 files changed, 14 insertions(+), 33 deletions(-) diff --git a/crypto/external/bsd/netpgp/dist/configure b/crypto/external/bsd/netpgp/dist/configure index a9b22a20cb64..cf99dfbef554 100755 --- a/crypto/external/bsd/netpgp/dist/configure +++ b/crypto/external/bsd/netpgp/dist/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for netpgp 20090423. # -# Report bugs to <"Alistair Crooks agc@netbsd.org c0596823">. +# Report bugs to c0596823>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -598,7 +598,7 @@ PACKAGE_NAME='netpgp' PACKAGE_TARNAME='netpgp' PACKAGE_VERSION='20090423' PACKAGE_STRING='netpgp 20090423' -PACKAGE_BUGREPORT='"Alistair Crooks agc@netbsd.org c0596823"' +PACKAGE_BUGREPORT='Alistair Crooks c0596823' ac_unique_file="src/bin/netpgp.c" # Factoring default headers for most tests. @@ -1355,7 +1355,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <"Alistair Crooks agc@netbsd.org c0596823">. +Report bugs to c0596823>. _ACEOF ac_status=$? fi @@ -3792,7 +3792,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3827,8 +3827,7 @@ done - -for ac_header in assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h +for ac_header in bzlib.h dmalloc.h direct.h errno.h fcntl.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -3948,7 +3947,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4102,7 +4101,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4254,7 +4253,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4409,7 +4408,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4565,7 +4564,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4720,7 +4719,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## -------------------------------------------------------- ## -## Report this to "Alistair Crooks agc@netbsd.org c0596823" ## +## Report this to Alistair Crooks c0596823 ## ## -------------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 diff --git a/crypto/external/bsd/netpgp/dist/configure.ac b/crypto/external/bsd/netpgp/dist/configure.ac index ff505845f7fa..ca6cbca7bbcc 100644 --- a/crypto/external/bsd/netpgp/dist/configure.ac +++ b/crypto/external/bsd/netpgp/dist/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 1.2 2009/04/25 01:29:14 agc Exp $ +dnl $Id: configure.ac,v 1.3 2009/05/05 15:29:46 agc Exp $ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) AC_INIT([netpgp],[20090423],[Alistair Crooks c0596823]) @@ -25,7 +25,7 @@ AC_SUBST(AUTOHEADER) dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([CommonCrypto/CommonDigest.h]) -AC_CHECK_HEADERS([assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h]) +AC_CHECK_HEADERS([bzlib.h dmalloc.h direct.h errno.h fcntl.h]) AC_CHECK_HEADERS([inttypes.h libgen.h limits.h malloc.h]) AC_CHECK_HEADERS([stdbool.h zlib.h]) AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/cast.h openssl/des.h openssl/dsa.h]) diff --git a/crypto/external/bsd/netpgp/dist/src/lib/config.h b/crypto/external/bsd/netpgp/dist/src/lib/config.h index 33b2e6b32ad9..54c5cb15c367 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/config.h +++ b/crypto/external/bsd/netpgp/dist/src/lib/config.h @@ -1,9 +1,6 @@ /* src/lib/config.h. Generated from config.h.in by configure. */ /* src/lib/config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the header file. */ -#define HAVE_ASSERT_H 1 - /* Define to 1 if you have the header file. */ #define HAVE_BZLIB_H 1 @@ -122,7 +119,7 @@ #define HAVE_ZLIB_H 1 /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "Alistair Crooks agc@netbsd.org c0596823" +#define PACKAGE_BUGREPORT "Alistair Crooks c0596823" /* Define to the full name of this package. */ #define PACKAGE_NAME "netpgp" diff --git a/crypto/external/bsd/netpgp/dist/src/lib/config.h.in b/crypto/external/bsd/netpgp/dist/src/lib/config.h.in index 13b1098aa8b0..ff1cf2c17f7e 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/config.h.in +++ b/crypto/external/bsd/netpgp/dist/src/lib/config.h.in @@ -1,8 +1,5 @@ /* src/lib/config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the header file. */ -#undef HAVE_ASSERT_H - /* Define to 1 if you have the header file. */ #undef HAVE_BZLIB_H diff --git a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c index 2ed449a12786..e2947b1c4480 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c +++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c @@ -52,10 +52,6 @@ #include "netpgpdefs.h" #include "parse_local.h" -#ifdef HAVE_ASSERT_H -#include -#endif - #ifdef HAVE_FCNTL_H #include #endif diff --git a/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c b/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c index cbde6db5e704..227b1f45d9f6 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c +++ b/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c @@ -39,10 +39,6 @@ #include "netpgpdefs.h" #include "parse_local.h" -#ifdef HAVE_ASSERT_H -#include -#endif - #include #include #include diff --git a/crypto/external/bsd/netpgp/dist/src/lib/validate.c b/crypto/external/bsd/netpgp/dist/src/lib/validate.c index d0ea04819cd9..38edaa349cac 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/validate.c +++ b/crypto/external/bsd/netpgp/dist/src/lib/validate.c @@ -37,10 +37,6 @@ #include #include -#ifdef HAVE_ASSERT_H -#include -#endif - #include #include