From 1418ba4594520f9e164fee1b1acfc0da594c4212 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Sun, 18 May 2003 15:25:28 +0000
Subject: [PATCH] Merge to latest beecrypt-3.0.0.

CVS patchset: 6858
CVS date: 2003/05/18 15:25:28
---
 beecrypt/acinclude.m4       | 26 ++++++++++++++++++++++++++
 beecrypt/config.m4.in       |  1 +
 beecrypt/configure.ac       |  1 +
 beecrypt/gas/asmdefs.m4     |  5 +++++
 beecrypt/gas/x86.m4         |  2 +-
 beecrypt/python/Makefile.am |  2 ++
 6 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/beecrypt/acinclude.m4 b/beecrypt/acinclude.m4
index 48a5cf202..6c687b204 100644
--- a/beecrypt/acinclude.m4
+++ b/beecrypt/acinclude.m4
@@ -11,6 +11,11 @@ dnl  LGPL
 dnl  BEECRYPT_INT_TYPES
 AC_DEFUN(BEECRYPT_INT_TYPES,[
   AC_TYPE_SIZE_T
+  bc_typedef_size_t=
+  if test $ac_cv_type_size_t != yes; then
+    bc_typedef_size_t="typedef unsigned size_t;"
+  fi
+  AC_SUBST(TYPEDEF_SIZE_T,$bc_typedef_size_t)
   if test $ac_cv_header_inttypes_h = yes; then
     AC_SUBST(INCLUDE_INTTYPES_H,["#include <inttypes.h>"])
   else
@@ -555,6 +560,27 @@ AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[
   ])
 
 
+dnl  BEECRYPT_ASM_ALIGN
+AC_DEFUN(BEECRYPT_ASM_ALIGN,[
+  AC_CACHE_CHECK([how to align symbols],
+    bc_cv_asm_align,[
+      case $target_os in
+      linux*)
+        case $target_cpu in
+        i[[3456]]86 | athlon*)
+          bc_cv_asm_align=".align 4"
+          ;;
+        s390x)
+          bc_cv_asm_align=".align 4"
+          ;;
+        esac
+        ;;
+      esac
+    ])
+  AC_SUBST(ASM_ALIGN,$bc_cv_asm_align)
+  ])
+
+
 dnl  BEECRYPT_ASM_SOURCES
 AC_DEFUN(BEECRYPT_ASM_SOURCES,[
   echo > mpopt.s
diff --git a/beecrypt/config.m4.in b/beecrypt/config.m4.in
index 412606cc6..746f61de6 100644
--- a/beecrypt/config.m4.in
+++ b/beecrypt/config.m4.in
@@ -11,6 +11,7 @@ define(`DATASEG',`@ASM_DATASEG@')
 define(`GLOBL',`@ASM_GLOBL@')
 define(`GSYM_PREFIX',`@ASM_GSYM_PREFIX@')
 define(`LSYM_PREFIX',`@ASM_LSYM_PREFIX@')
+define(`ALIGN',`@ASM_ALIGN@')
 define(`__CONFIG_M4_INCLUDED__')
 include(`@top_srcdir@/gas/asmdefs.m4')
 ')
diff --git a/beecrypt/configure.ac b/beecrypt/configure.ac
index f2ee080a7..75cd4f7a0 100644
--- a/beecrypt/configure.ac
+++ b/beecrypt/configure.ac
@@ -626,6 +626,7 @@ else
   BEECRYPT_ASM_GLOBL
   BEECRYPT_ASM_GSYM_PREFIX
   BEECRYPT_ASM_LSYM_PREFIX
+  BEECRYPT_ASM_ALIGN
   # generate assembler source files from m4 files
   BEECRYPT_ASM_SOURCES
 fi
diff --git a/beecrypt/gas/asmdefs.m4 b/beecrypt/gas/asmdefs.m4
index f8341c95f..7b4146f31 100644
--- a/beecrypt/gas/asmdefs.m4
+++ b/beecrypt/gas/asmdefs.m4
@@ -25,8 +25,13 @@ define(USE_SIZE_DIRECTIVE,yes)
 define(SYMNAME,`GSYM_PREFIX`$1'')
 define(LOCAL,`LSYM_PREFIX`$1'')
 
+ifdef(ALIGN,,`
+define(ALIGN)
+')
+
 define(C_FUNCTION_BEGIN,`
 	TEXTSEG
+	ALIGN
 	GLOBL SYMNAME($1)
 SYMNAME($1):
 ')
diff --git a/beecrypt/gas/x86.m4 b/beecrypt/gas/x86.m4
index 8881dc750..b593e18be 100644
--- a/beecrypt/gas/x86.m4
+++ b/beecrypt/gas/x86.m4
@@ -21,7 +21,7 @@ dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ifelse(substr(ASM_ARCH,0,6),athlon,`
 define(USE_BSWAP)
 ')
-ifelse(substr(ASM_ARCHi,0,7),pentium,`
+ifelse(substr(ASM_ARCH,0,7),pentium,`
 define(USE_BSWAP)
 ')
 ifelse(ASM_ARCH,i586,`
diff --git a/beecrypt/python/Makefile.am b/beecrypt/python/Makefile.am
index 47f76909e..c72d2477a 100644
--- a/beecrypt/python/Makefile.am
+++ b/beecrypt/python/Makefile.am
@@ -6,6 +6,8 @@ LINT = splint
 
 PYVER= 2.2
 
+SUBDIRS = test
+
 pylibdir = $(shell python -c 'import sys; print sys.path[1]')
 pyincdir = $(prefix)/include/python${PYVER}