- make peace with automake et al in 8.0, ugh.

- auto-configure with gcj, build javaglue.c.

CVS patchset: 5325
CVS date: 2002/02/20 21:00:15

15 files changed, 69 insertions, 400 deletions

diff --git a/beecrypt/.cvsignore b/beecrypt/.cvsignore
index f3c81cba7..52496e94f 100644
--- a/beecrypt/.cvsignore
+++ b/beecrypt/.cvsignore
@@ -6,6 +6,7 @@ Doxyfile
 Makefile
 Makefile.in
 apidocs
+becrypt.spec
 beecrypt-*.tar.gz
 config.cache
 config.guess
@@ -24,4 +25,5 @@ ltmain.sh
 *.lo
 *.S
 stamp-h
+stamp-h1
 stamp-h.in
diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am
index 0cd264ea8..78a7c24a3 100644
--- a/beecrypt/Makefile.am
+++ b/beecrypt/Makefile.am
@@ -63,13 +63,15 @@ beetest: all
 	make -C tests beetest
 	./tests/beetest
 
+# XXX don't bite into gcj java dependencies (yet)
 .PHONY: sources
 sources:
 	@echo $(libbeecrypt_la_SOURCES:%=beecrypt/%) | sed -e 's,beecrypt/javaglue.c,,'
 
+# XXX don't bite into javaglue.c (yet)
 .PHONY: lclint
 lclint:
-	lclint $(DEFS) $(INCLUDES) ${libbeecrypt_la_SOURCES} tests/beetest.c
+	lclint $(DEFS) $(INCLUDES) $(libbeecrypt_la_SOURCES:javaglue.c=) tests/beetest.c
 
 .PHONY: listobjs
 listobjs:
diff --git a/beecrypt/Makefile.in b/beecrypt/Makefile.in
index fdce22f9c..ba22212e9 100644
--- a/beecrypt/Makefile.in
+++ b/beecrypt/Makefile.in
@@ -111,6 +111,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@
@@ -584,13 +585,15 @@ beetest: all
 	make -C tests beetest
 	./tests/beetest
 
+# XXX don't bite into gcj java dependencies (yet)
 .PHONY: sources
 sources:
 	@echo $(libbeecrypt_la_SOURCES:%=beecrypt/%) | sed -e 's,beecrypt/javaglue.c,,'
 
+# XXX don't bite into javaglue.c (yet)
 .PHONY: lclint
 lclint:
-	lclint $(DEFS) $(INCLUDES) ${libbeecrypt_la_SOURCES} tests/beetest.c
+	lclint $(DEFS) $(INCLUDES) $(libbeecrypt_la_SOURCES:javaglue.c=) tests/beetest.c
 
 .PHONY: listobjs
 listobjs:
diff --git a/beecrypt/acconfig.h b/beecrypt/acconfig.h
index 961cf8c27..7847d5580 100644
--- a/beecrypt/acconfig.h
+++ b/beecrypt/acconfig.h
@@ -27,9 +27,6 @@
 #define _REENTRANT
 #endif
 
-#undef PACKAGE
-#undef VERSION
-
 #define AIX			0
 #define BEOS		0
 #define CYGWIN		0
diff --git a/beecrypt/beecrypt.spec b/beecrypt/beecrypt.spec
deleted file mode 100644
index 01b5ceca0..000000000
--- a/beecrypt/beecrypt.spec
+++ /dev/null
@@ -1,63 +0,0 @@
-Summary: The BeeCrypt Cryptography Library
-Name: beecrypt
-Version: 2.2.0
-Release: 1
-Copyright: LGPL
-Group: Development/Libraries
-Source0: http://beecrypt.virtualunlimited.com/download/beecrypt-%{version}.tar.gz
-URL: http://beecrypt.virtualunlimited.com/
-Buildroot: %{_tmppath}/%{name}-root
-
-%description
-The BeeCrypt Cryptography Library.
-
-%package devel
-Summary: The BeeCrypt Cryptography Library headers
-Group: Development/Libraries
-Requires: beecrypt = %{version}
-
-%description devel
-The BeeCrypt Cryptography Library headers.
-
-%prep
-%setup -q
-
-%build
-%configure --enable-static
-make
-make apidocs
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR="${RPM_BUILD_ROOT}" install
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc BENCHMARKS NEWS README*
-%{_libdir}/libbeecrypt.so.2.2.0
-
-%files devel
-%defattr(-,root,root)
-%doc BUGS ChangeLog apidocs/*
-%{_libdir}/libbeecrypt.so.2
-%{_libdir}/libbeecrypt.so
-%{_libdir}/libbeecrypt.la
-%{_libdir}/libbeecrypt.a
-%{_includedir}/beecrypt
-
-%changelog
-* Mon Oct  8 2001 Jeff Johnson <jbj@redhat.com>
-- upgrade to 2.2.0pre.
-
-* Mon Sep 24 2001 Jeff Johnsopn <jbj@redhat.com>
-- add static libraries.
-
-* Tue Sep 18 2001 Jeff Johnson <jbj@redhat.com>
-- repackage.
diff --git a/beecrypt/blowfishopt.c b/beecrypt/blowfishopt.c
deleted file mode 100644
index 1692edb0c..000000000
--- a/beecrypt/blowfishopt.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * blowfishopt.c
- *
- * An empty file, in case the library is compiled on a platform for which there are no
- * assembler-optimized functions implemented (yet)
- *
- * And just so that the compiler doesn't complain:
- */
-
-#define BEECRYPT_DLL_EXPORT
-
-#include "blowfishopt.h"
diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in
index a4450ebf6..f93c9e1d6 100644
--- a/beecrypt/config.gnu.h.in
+++ b/beecrypt/config.gnu.h.in
@@ -28,9 +28,6 @@
 #define _REENTRANT
 #endif
 
-#undef PACKAGE
-#undef VERSION
-
 #define AIX			0
 #define BEOS		0
 #define CYGWIN		0
diff --git a/beecrypt/configure.in b/beecrypt/configure.in
index 5c7fc2a3f..d29aca05b 100644
--- a/beecrypt/configure.in
+++ b/beecrypt/configure.in
@@ -117,12 +117,50 @@ AC_ARG_WITH(javaglue, [  --with-javaglue         creates the java glue code [def
   ], [ ac_with_javaglue=yes ])
 
 if test "$ac_with_javaglue" = yes ; then
-  AC_CHECK_PROG(ac_cv_have_java, java, yes, no)
-  if test "$ac_cv_have_java" = yes; then
-    AC_CHECK_PROG(ac_cv_have_javac, javac, yes, no)
-    if test "$ac_cv_have_javac" = yes; then
-      AC_CACHE_CHECK([for java native interface headers], ac_cv_java_include, [
-        cat > conftest.java << EOF
+  AC_CHECK_PROG(ac_cv_have_gcj, gcj, yes, no)
+  if test "$ac_cv_have_gcj" = yes; then
+    AC_CACHE_CHECK([for java native interface headers], ac_cv_java_include, [
+      cat > conftest.java << EOF
+public class conftest
+{
+  public static void main(String[[]] argv)
+  {
+     System.out.println(System.getProperty("java.home"));
+  }
+}
+EOF
+      java_home="`gcj --main=conftest -o conftest conftest.java; ./conftest`"
+      if test -d "$ac_cv_java_include" ; then
+        ac_cv_java_headers=yes
+      else
+	case $target_os in
+	linux*)
+	  gcjpath="/usr/lib/gcc-lib/`gcj -dumpmachine`/`gcj -dumpversion`"
+	  if test -f $gcjpath/include/jni.h; then
+	    ac_cv_java_include="$gcjpath/include"
+	  fi
+          ;;
+        *)
+          ac_cv_java_include="$java_home"/../include
+          ;;
+        esac
+        if test "X$ac_cv_java_include" != X -a -d "$ac_cv_java_include" ; then
+          ac_cv_java_headers=yes
+        else
+          AC_MSG_WARN([java headers not found, disabling javaglue])
+          ac_cv_java_headers=no
+          ac_with_javaglue=no
+        fi
+      fi
+      rm -fr conftest*
+    ])
+  else
+    AC_CHECK_PROG(ac_cv_have_java, java, yes, no)
+    if test "$ac_cv_have_java" = yes; then
+      AC_CHECK_PROG(ac_cv_have_javac, javac, yes, no)
+      if test "$ac_cv_have_javac" = yes; then
+        AC_CACHE_CHECK([for java native interface headers], ac_cv_java_include, [
+          cat > conftest.java << EOF
 public class conftest
 {
   public static void main(String[[]] argv)
@@ -157,15 +195,12 @@ EOF
           fi
           rm -fr conftest*
         ])
-    else
-      AC_MSG_WARN([javac not found, disabling javaglue])
-      ac_cv_java_headers=no
-      ac_with_javaglue=no
+      else
+        AC_MSG_WARN([javac not found, disabling javaglue])
+        ac_cv_java_headers=no
+        ac_with_javaglue=no
+      fi
     fi
-  else
-    AC_MSG_WARN([java not found, disabling javaglue])
-    ac_cv_java_headers=no
-    ac_with_javaglue=no
   fi
 fi
 
@@ -509,7 +544,9 @@ case $target_os in
 esac
 
 if test "$ac_with_javaglue" = yes ; then
-  CFLAGS="$CFLAGS -I$ac_cv_java_include"
+  if test "$ac_cv_have_gcj" = no; then
+    CFLAGS="$CFLAGS -I$ac_cv_java_include"
+  fi
   case $target_os in
   cygwin*)
     CFLAGS="$CFLAGS -I$ac_cv_java_include"/win32
@@ -517,7 +554,9 @@ if test "$ac_with_javaglue" = yes ; then
   darwin*)
     ;;
   linux*)
-    CFLAGS="$CFLAGS -I$ac_cv_java_include"/linux
+    if test "$ac_cv_have_gcj" = no; then
+      CFLAGS="$CFLAGS -I$ac_cv_java_include"/linux
+    fi
     ;;
   osf*)
     CFLAGS="$CFLAGS -I$ac_cv_java_include"/osf
diff --git a/beecrypt/docs/Makefile.in b/beecrypt/docs/Makefile.in
index f4f497359..0e4449b8e 100644
--- a/beecrypt/docs/Makefile.in
+++ b/beecrypt/docs/Makefile.in
@@ -103,6 +103,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@
diff --git a/beecrypt/fips180opt.c b/beecrypt/fips180opt.c
deleted file mode 100644
index 90e368f3e..000000000
--- a/beecrypt/fips180opt.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * fips180pt.c
- *
- * Inline assembler optimized sha1 routines
- * 
- * Copyright (c) 2000 Virtual Unlimited B.V.
- *
- * Author: Bob Deblier <bob@virtualunlimited.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#define BEECRYPT_DLL_EXPORT
-
-#include "fips180.h"
-
-#if WIN32
-#if __INTEL__ && __MWERKS__
-
-void sha1ProcessMMX(sha1Param *param)
-{
-	uint64 tstart, tstop;
-	
-	asm {
-		rdtsc
-		mov dword ptr tstart,eax
-		mov dword ptr tstart+4,edx
-
-		mov esi,dword ptr param
-		lea edi,[esi+20+64]
-		mov ecx,-15
-		xor eax,eax
-		
-swaps:
-		mov edx,[edi+ecx*4]
-		bswap edx
-		mov [edi+ecx*4],eax
-		inc ecx
-		jnz swaps
-		
-/* don't do this one in MMX */
-
-		mov [esi+352],al
-		mov ecx,16
-
-/* don't unroll any futher */
-
-		align 4
-xors:
-		mov eax,[edi-12]
-		mov ebx,[edi-8]
-		xor eax,[edi-24]
-		xor ebx,[edi-20]
-		xor eax,[edi-56]
-		xor ebx,[edi-52]
-		xor eax,[edi-64]
-		xor ebx,[edi-60]
-		rol eax,1
-		rol ebx,1
-		mov [edi],eax
-		mov [edi+4],ebx
-		mov eax,[edi-4]
-		mov ebx,[edi]
-		xor eax,[edi-16]
-		xor ebx,[edi-8]
-		xor eax,[edi-48]
-		xor ebx,[edi-44]
-		xor eax,[edi-56]
-		xor ebx,[edi-52]
-		rol eax,1
-		rol ebx,1
-		mov [edi+8],eax
-		mov [edi+12],ebx
-		lea edi,[edi+16]
-		dec ecx
-		jnz xors
-
-		mov edi,20
-		
-/* non-mmx subround1 */
-subround1:
-		; do subround one in registers
-		mov eax,dword ptr [esi+0]
-		mov ebx,dword ptr [esi+4]
-		mov ecx,dword ptr [esi+8]
-		mov edx,dword ptr [esi+12]
-		rol eax,5
-		xor ecx,edx
-		add eax,dword ptr [esi+16]
-		and ecx,ebx
-		add eax,0x5a827999
-		ror ebx,2
-		add eax,dword ptr [esi+edi+0]
-		xor ecx,edx
-		mov dword ptr [esi+4],ebx
-		add eax,ecx
-		mov dword ptr [esi+16],eax
-		; eax is still okay!
-		; ecx's value is in ebx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+0]
-		mov edx,dword ptr [esi+8]
-		rol eax,5
-		xor ecx,edx
-		add eax,dword ptr [esi+12]
-		and ecx,ebx
-		add eax,0x5a827999
-		ror ebx,2
-		add eax,dword ptr [esi+edi+4]
-		xor ecx,edx
-		mov dword ptr [esi+0],ebx
-		add eax,ecx
-		mov dword ptr [esi+12],eax
-		; eax is still okay!
-		; ecx's value is in ebx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+16]
-		mov edx,dword ptr [esi+4]
-		rol eax,5
-		xor ecx,edx
-		add eax,dword ptr [esi+8]
-		and ecx,ebx
-		add eax,0x5a827999
-		ror ebx,2
-		add eax,dword ptr [esi+edi+8]
-		xor ecx,edx
-		mov dword ptr [esi+16],ebx
-		add eax,ecx
-		mov dword ptr [esi+8],eax
-		; eax is still okay!
-		; ecx's value is in ebx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+12]
-		mov edx,dword ptr [esi+0]
-		rol eax,5
-		xor ecx,edx
-		add eax,dword ptr [esi+4]
-		and ecx,ebx
-		add eax,0x5a827999
-		ror ebx,2
-		add eax,dword ptr [esi+edi+12]
-		xor ecx,edx
-		mov dword ptr [esi+12],ebx
-		add eax,ecx
-		mov dword ptr [esi+4],eax
-		; eax is still okay!
-		; ecx's value is in ebx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+8]
-		mov edx,dword ptr [esi+16]
-		rol eax,5
-		xor ecx,edx
-		add eax,dword ptr [esi+0]
-		and ecx,ebx
-		add eax,0x5a827999
-		ror ebx,2
-		add eax,dword ptr [esi+edi+16]
-		xor ecx,edx
-		mov dword ptr [esi+8],ebx
-		add eax,ecx
-		mov dword ptr [esi+0],eax
-		; this has to be repeated 5 times
-		add edi,20
-		cmp edi,120
-		jne subround1
-
-subround2:
-		mov eax,dword ptr [esi+0]
-		mov ebx,dword ptr [esi+4]
-		mov ecx,dword ptr [esi+8]
-		mov edx,dword ptr [esi+12]
-		rol eax,5
-		xor edx,ebx
-		add eax,dword ptr [esi+16]
-		xor edx,ecx
-		add eax,0x6ed9eba1
-		ror ebx,2
-		add eax,dword ptr [esi+edi+0]
-		mov dword ptr [esi+4],ebx
-		add eax,edx
-		mov dword ptr [esi+16],eax
-		; eax is still okay
-		; move ecx to edx
-		; move ebx to ecx
-		mov edx,ecx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+0]
-		rol eax,5
-		xor edx,ebx
-		add eax,dword ptr [esi+12]
-		xor edx,ecx
-		add eax,0x6ed9eba1
-		ror ebx,2
-		add eax,dword ptr [esi+edi+4]
-		mov dword ptr [esi+0],ebx
-		add eax,edx
-		mov dword ptr [esi+12],eax
-		; eax is still okay
-		; move ecx to edx
-		; move ebx to ecx
-		mov edx,ecx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+16]
-		rol eax,5
-		xor edx,ebx
-		add eax,dword ptr [esi+8]
-		xor edx,ecx
-		add eax,0x6ed9eba1
-		ror ebx,2
-		add eax,dword ptr [esi+edi+8]
-		mov dword ptr [esi+16],ebx
-		add eax,edx
-		mov dword ptr [esi+8],eax
-		; eax is still okay
-		; move ecx to edx
-		; move ebx to ecx
-		mov edx,ecx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+12]
-		rol eax,5
-		xor edx,ebx
-		add eax,dword ptr [esi+4]
-		xor edx,ecx
-		add eax,0x6ed9eba1
-		ror ebx,2
-		add eax,dword ptr [esi+edi+12]
-		mov dword ptr [esi+12],ebx
-		add eax,edx
-		mov dword ptr [esi+4],eax
-		; eax is still okay
-		; move ecx to edx
-		; move ebx to ecx
-		mov edx,ecx
-		mov ecx,ebx
-		mov ebx,dword ptr [esi+8]
-		rol eax,5
-		xor edx,ebx
-		add eax,dword ptr [esi+0]
-		xor edx,ecx
-		add eax,0x6ed9eba1
-		ror ebx,2
-		add eax,dword ptr [esi+edi+16]
-		mov dword ptr [esi+8],ebx
-		add eax,edx
-		mov dword ptr [esi+0],eax
-		add edi,20
-		cmp edi,240
-		jne subround2
-
-		; time it
-		rdtsc
-		mov dword ptr tstop,eax
-		mov dword ptr tstop+4,edx
-	}
-	
-	printf("took %lld clocks\n", tstop - tstart);
-}
-
-#endif
-#endif
diff --git a/beecrypt/gas/Makefile.in b/beecrypt/gas/Makefile.in
index 6ec0172cb..f1c5f46bb 100644
--- a/beecrypt/gas/Makefile.in
+++ b/beecrypt/gas/Makefile.in
@@ -103,6 +103,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@
diff --git a/beecrypt/masm/Makefile.in b/beecrypt/masm/Makefile.in
index 5c6961efb..9837efd6c 100644
--- a/beecrypt/masm/Makefile.in
+++ b/beecrypt/masm/Makefile.in
@@ -103,6 +103,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@
diff --git a/beecrypt/mp32opt.c b/beecrypt/mp32opt.c
deleted file mode 100644
index ddebca20c..000000000
--- a/beecrypt/mp32opt.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * mp32opt.c
- *
- * Inline assembler optimized multi-precision integer routines
- * 
- * Copyright (c) 1999-2000 Virtual Unlimited B.V.
- *
- * Author: Bob Deblier <bob@virtualunlimited.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#define BEECRYPT_DLL_EXPORT
-
-#include "mp32opt.h"
diff --git a/beecrypt/mwerks/Makefile.in b/beecrypt/mwerks/Makefile.in
index 2d84c8a6f..b17d9b5ac 100644
--- a/beecrypt/mwerks/Makefile.in
+++ b/beecrypt/mwerks/Makefile.in
@@ -103,6 +103,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@
diff --git a/beecrypt/tests/Makefile.in b/beecrypt/tests/Makefile.in
index c884326e3..7b780aa9c 100644
--- a/beecrypt/tests/Makefile.in
+++ b/beecrypt/tests/Makefile.in
@@ -103,6 +103,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_cv_have_gcj = @ac_cv_have_gcj@
 ac_cv_have_java = @ac_cv_have_java@
 ac_cv_have_javac = @ac_cv_have_javac@
 am__include = @am__include@