diff -ur beecrypt-2.2.0~/Doxyfile.in beecrypt-2.2.0/Doxyfile.in
--- beecrypt-2.2.0~/Doxyfile.in Fri Sep 21 00:16:11 2001
+++ beecrypt-2.2.0/Doxyfile.in Tue Mar 26 17:14:46 2002
@@ -311,6 +311,7 @@
@top_srcdir@/base64.h \
@top_srcdir@/beecrypt.c \
@top_srcdir@/beecrypt.h \
+ @top_srcdir@/beecrypt_config.h \
@top_srcdir@/blockmode.c \
@top_srcdir@/blockmode.h \
@top_srcdir@/blockpad.c \
@@ -319,7 +320,6 @@
@top_srcdir@/blowfish.h \
@top_srcdir@/blowfishopt.h \
@top_srcdir@/config.gas.h \
- @top_srcdir@/config.h \
@top_srcdir@/config.win.h \
@top_srcdir@/dhaes.c \
@top_srcdir@/dhaes.h \
diff -ur beecrypt-2.2.0~/Makefile.am beecrypt-2.2.0/Makefile.am
--- beecrypt-2.2.0~/Makefile.am Mon Oct 8 18:48:22 2001
+++ beecrypt-2.2.0/Makefile.am Tue Mar 26 17:16:37 2002
@@ -54,7 +54,7 @@
libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
-pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h
+pkginclude_HEADERS = base64.h beecrypt.h beecrypt_config.h beecrypt_config.gnu.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h
EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec config.h config.gas.h config.win.h javaglue.h
diff -ur beecrypt-2.2.0~/beecrypt.h beecrypt-2.2.0/beecrypt.h
--- beecrypt-2.2.0~/beecrypt.h Mon Oct 8 18:48:23 2001
+++ beecrypt-2.2.0/beecrypt.h Tue Mar 26 17:14:46 2002
@@ -26,10 +26,7 @@
#ifndef _BEECRYPT_H
#define _BEECRYPT_H
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include "beecrypt_config.h"
#include "memchunk.h"
#include "mp32number.h"
diff -ur beecrypt-2.2.0~/config.h beecrypt-2.2.0/config.h
--- beecrypt-2.2.0~/config.h Mon Oct 8 18:48:23 2001
+++ beecrypt-2.2.0/config.h Tue Mar 26 17:16:10 2002
@@ -23,8 +23,8 @@
*
*/
-#ifndef _CONFIG_H
-#define _CONFIG_H
+#ifndef _BEECRYPT_CONFIG_H
+#define _BEECRYPT_CONFIG_H
#if defined(_WIN32) && !defined(WIN32)
# define WIN32 1
@@ -40,7 +40,7 @@
# endif
/*typedef UINT8_TYPE byte;*/
#else
-# include "config.gnu.h"
+# include "beecrypt_config.gnu.h"
# define BEECRYPTAPI
typedef UINT8_TYPE byte;
#endif
diff -ur beecrypt-2.2.0~/configure.in beecrypt-2.2.0/configure.in
--- beecrypt-2.2.0~/configure.in Mon Oct 8 19:48:30 2001
+++ beecrypt-2.2.0/configure.in Tue Mar 26 17:14:46 2002
@@ -344,9 +344,6 @@
esac
dnl Checks for compiler flags
-CFLAGS=""
-CPPFLAGS=""
-LDFLAGS=""
if test "$ac_enable_optimized" = yes; then
case $target_cpu in
@@ -413,41 +410,7 @@
fi
else
if test "$ac_cv_prog_gcc" = yes; then
- CFLAGS="$CFLAGS -O3 -g"
- if test "$ac_enable_optimized" = yes; then
- case $target_cpu in
-# This switch makes the mp32 routines slower by about 10%, so it's disabled
-# alphaev6)
-# CFLAGS="$CFLAGS -mcpu=ev6"
-# ;;
- arm*)
- CFLAGS="$CFLAGS -fomit-frame-pointer"
- ;;
- i386)
- CFLAGS="$CFLAGS -m386 -march=i386 -fomit-frame-pointer"
- ;;
- i486)
- CFLAGS="$CFLAGS -m486 -march=i486 -fomit-frame-pointer"
- ;;
- i586)
- CFLAGS="$CFLAGS -mpentium -march=pentium -fomit-frame-pointer"
- ;;
- i686)
- CFLAGS="$CFLAGS -mpentiumpro -march=pentiumpro -fomit-frame-pointer"
- ;;
- sparcv8)
- CFLAGS="$CFLAGS -mv8"
- ;;
-# This actually performs WORSE on gcc up to 2.95.3!
-# sparcv8plus*)
-# CFLAGS="$CFLAGS -mv8plus"
-# ;;
- sparcv9*)
- AC_MSG_WARN([gcc currently cannot build 64-bit objects])
- CFLAGS="$CFLAGS -mcpu=v9 -m64 -mptr64"
- ;;
- esac
- fi
+ CFLAGS="$CFLAGS -momit-leaf-frame-pointer"
elif test "$ac_cv_prog_SUNPRO_CC" = yes; then
CFLAGS="$CFLAGS -fast"
if test "$ac_enable_threads" = yes; then
diff -ur beecrypt-2.2.0~/memchunk.h beecrypt-2.2.0/memchunk.h
--- beecrypt-2.2.0~/memchunk.h Mon Oct 8 19:48:30 2001
+++ beecrypt-2.2.0/memchunk.h Tue Mar 26 17:14:46 2002
@@ -25,9 +25,7 @@
#ifndef _MEMCHUNK_H
#define _MEMCHUNK_H
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "beecrypt_config.h"
typedef struct
{
diff -ur beecrypt-2.2.0~/mp32number.h beecrypt-2.2.0/mp32number.h
--- beecrypt-2.2.0~/mp32number.h Mon Oct 8 20:12:33 2001
+++ beecrypt-2.2.0/mp32number.h Tue Mar 26 17:14:46 2002
@@ -28,9 +28,7 @@
#ifndef _MP32NUMBER_H
#define _MP32NUMBER_H
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "beecrypt_config.h"
/**
*/
