Before merging new-fangled configure.ac
authorjbj <devnull@localhost>
Sat, 15 Jun 2002 14:28:29 +0000 (14:28 +0000)
committerjbj <devnull@localhost>
Sat, 15 Jun 2002 14:28:29 +0000 (14:28 +0000)
CVS patchset: 5488
CVS date: 2002/06/15 14:28:29

beecrypt/Makefile.in
beecrypt/config.h
beecrypt/config.h.in
beecrypt/configure.ac [new file with mode: 0644]
beecrypt/configure.in [deleted file]
beecrypt/docs/Makefile.in
beecrypt/gas/Makefile.in
beecrypt/masm/Makefile.in
beecrypt/mwerks/Makefile.in
beecrypt/tests/Makefile.in

index 0cfa9fb6f9b01d031798729f8ce55097ae62c66e..62690fbbf3abfebf499fb3dbc9ab7b81ae4cd891 100644 (file)
@@ -206,7 +206,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 DIST_COMMON = README $(noinst_HEADERS) $(pkginclude_HEADERS) AUTHORS \
        COPYING COPYING.LIB ChangeLog Doxyfile.in INSTALL Makefile.am \
        Makefile.in NEWS acconfig.h aclocal.m4 beecrypt.spec.in \
-       config.guess config.h.in config.sub configure configure.in \
+       config.guess config.h.in config.sub configure configure.ac \
        depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs \
        types.h.in
 DIST_SUBDIRS = $(SUBDIRS)
@@ -217,7 +217,7 @@ all: config.h
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -225,10 +225,10 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in 
+$(ACLOCAL_M4):  configure.ac 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
@@ -241,7 +241,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status config.h
 
-$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
+$(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
        cd $(top_srcdir) && $(AUTOHEADER)
        touch $(srcdir)/config.h.in
 
index 395f05f49a1ede13f9c139aaf52150ec17ef791a..abbffbd92d08f051c31e29575e3ecf9eeb1fa7eb 100644 (file)
@@ -1,5 +1,5 @@
 /* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 /*
  * acconfig.h
  *
index 82c97fc9c37609c4bd921b4e79ae32ba385a4389..b65328e2279252770dbe6d26905260624e0c8436 100644 (file)
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 /*
  * acconfig.h
  *
diff --git a/beecrypt/configure.ac b/beecrypt/configure.ac
new file mode 100644 (file)
index 0000000..f71ab13
--- /dev/null
@@ -0,0 +1,822 @@
+dnl Process this file with autoconf to produce a configure script
+
+dnl Initialization
+AC_INIT(beecrypt.c)
+AC_CANONICAL_SYSTEM
+AC_CONFIG_HEADERS
+AM_INIT_AUTOMAKE(beecrypt, 2.2.0)
+AM_CONFIG_HEADER(config.h)
+
+dnl Automake
+AM_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+
+dnl Check system type
+case $target_os in
+  cygwin*)
+    AC_DEFINE(CYGWIN)
+    AC_DEFINE(WIN32)
+    ;;
+  darwin*)
+    AC_DEFINE(DARWIN)
+    ;;
+  freebsd*)
+    AC_DEFINE(FREEBSD)
+    ;;
+  linux*)
+    AC_DEFINE(LINUX)
+    ;;
+  netbsd*)
+    AC_DEFINE(NETBSD)
+    ;;
+  openbsd*)
+    AC_DEFINE(OPENBSD)
+    ;;
+  osf*)
+    AC_DEFINE(OSF)
+    ;;
+  *qnx)
+    AC_DEFINE(QNX)
+    ;;
+  solaris*)
+    AC_DEFINE(SOLARIS)
+    ;;
+  sysv*uv*)
+    AC_DEFINE(SCO_UNIX)
+    ;;
+  *)
+    AC_MSG_WARN([Operating system type $target_os currently not supported and/or tested])
+    ;;
+esac
+case $target_os in
+  cygwin* | darwin*)
+    AC_DEFINE(LEADING_UNDERSCORE)
+    ;;
+  *)
+    AC_DEFINE(NO_UNDERSCORES)
+    ;;
+esac
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_LN_S
+AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+
+AC_C_INLINE
+
+if test "$ac_cv_prog_gcc" != yes; then
+  AC_CACHE_CHECK([whether we are using Sun Workshop C], ac_cv_prog_SUNPRO_CC, [
+    AC_EGREP_CPP(yes, [
+      #ifdef __SUNPRO_C
+        yes;
+      #endif
+      ], ac_cv_prog_SUNPRO_CC=yes, ac_cv_prog_SUNPRO_CC=no)
+    ])
+  if test "$ac_cv_prog_SUNPRO_CC" != yes; then
+    AC_CACHE_CHECK([whether we are using Compaq's C compiler], ac_cv_prog_DECC, [
+      AC_EGREP_CPP(yes, [
+        #ifdef __DECC
+          yes;
+        #endif
+        ], ac_cv_prog_DECC=yes, ac_cv_prog_DECC=no)
+      ])
+  fi
+fi
+
+AC_ARG_ENABLE(debug, [  --enable-debug          creates debugging code [default=no]],
+  [ if test "$enableval" = no; then
+      ac_enable_debug=no
+    else
+      ac_enable_debug=yes
+    fi
+  ], [ ac_enable_debug=no])
+
+dnl Check if we need to disable optimizations
+AC_ARG_ENABLE(optimized, [  --enable-optimized      enables the assembler optimizations [default depends on --enable-debug value]],
+  [ if test "$enableval" = no; then
+      ac_enable_optimized=no
+    else
+      ac_enable_optimized=yes
+   fi
+  ],
+  [ if test "$ac_enable_debug" = no; then
+      ac_enable_optimized=yes
+    else
+      ac_enable_optimized=no
+    fi
+  ])
+
+dnl Check if we have the necessary java components installed
+AC_ARG_WITH(javaglue, [  --with-javaglue         creates the java glue code [default=yes]],
+  [ if test "$withval" = no; then
+      ac_with_javaglue=no
+    else
+      ac_with_javaglue=yes
+    fi
+  ], [ ac_with_javaglue=yes ])
+
+if test "$ac_with_javaglue" = yes ; then
+  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)
+  {
+     System.out.println(System.getProperty("java.home"));
+  }
+}
+EOF
+          java_home=`javac conftest.java; java -classpath . conftest`
+          case $target_os in
+          cygwin*)
+            java_home=`cygpath -u -p "$java_home"`
+            ;;
+          esac
+          if test -d "$ac_cv_java_include" ; then
+            ac_cv_java_headers=yes
+          else
+            case $target_os in
+            darwin*)
+              ac_cv_java_include="$java_home"/../../../Headers
+              ;;
+            *)
+              ac_cv_java_include="$java_home"/../include
+            esac
+            if test -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_MSG_WARN([javac not found, disabling javaglue])
+        ac_cv_java_headers=no
+        ac_with_javaglue=no
+      fi
+    fi
+  fi
+fi
+
+if test "$ac_with_javaglue" = yes ; then
+  AC_DEFINE(JAVAGLUE,1)
+else
+  AC_DEFINE(JAVAGLUE,0)
+fi
+
+dnl Check if we want to enable threads
+AC_ARG_ENABLE(threads, [  --enable-threads        enables multithread safety [default=yes]],
+  [ if test "$enableval" = no; then
+      ac_enable_threads=no
+    else
+      ac_enable_threads=yes
+    fi
+  ], [ ac_enable_threads=yes ])
+
+dnl Check if we want to enable aio
+AC_ARG_ENABLE(aio, [  --enable-aio            enables asynchronous i/o for entropy gathering [default=yes]],
+  [ if test "$enableval" = no; then
+      ac_enable_aio=no
+    else
+      ac_enable_aio=yes
+    fi
+  ], [ ac_enable_aio=yes ])
+
+dnl Check if we want to use mtmalloc
+AC_ARG_WITH(mtmalloc, [  --with-mtmalloc         links against the mtmalloc library [default=no]],
+  [ if test "$withval" = no; then
+      ac_with_mtmalloc=no
+    else
+      ac_with_mtmalloc=yes
+    fi
+  ], [ ac_with_mtmalloc=no ])
+
+dnl Product and version
+AC_SUBST(CC)
+AC_SUBST(CPP)
+AC_SUBST(LD)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+
+dnl Checks for library functions.
+AC_FUNC_MEMCMP
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(errno.h string.h ctype.h stdlib.h)
+AC_CHECK_HEADERS(unistd.h fcntl.h)
+AC_CHECK_HEADERS(sys/types.h sys/stat.h)
+AC_CHECK_HEADERS(termio.h termios.h)
+AC_CHECK_HEADERS(sys/audioio.h sys/ioctl.h sys/soundcard.h)
+
+AC_CHECK_HEADERS(time.h sys/time.h)
+if test "$ac_cv_header_sys_time_h" = yes; then
+  AC_CHECK_FUNC(gettimeofday, [
+    AC_DEFINE(HAVE_GETTIMEOFDAY, 1)
+    ])
+  AC_CHECK_FUNC(gethrtime, [
+    AC_DEFINE(HAVE_GETHRTIME, 1)
+    ])
+fi
+
+case $target_os in
+  cygwin*)
+    ;;
+  *)
+    if test "$ac_enable_threads" = yes; then
+      AC_DEFINE(ENABLE_THREADS, 1)
+      AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
+      if test "$ac_cv_header_thread_h" = yes; then
+        AC_HAVE_LIBRARY(thread)
+      elif test  "$ac_cv_header_pthread_h" = yes; then
+        AC_HAVE_LIBRARY(pthread)
+      else
+        AC_MSG_WARN([Can't find any thread libraries])
+        AC_DEFINE(ENABLE_THREADS, 0)
+      fi
+    fi
+
+    if test "$ac_enable_aio" = yes; then
+      AC_CHECK_HEADERS(aio.h)
+      if test "$ac_cv_header_aio_h" = yes; then
+        AC_SEARCH_LIBS(aio_read, [c rt aio posix4], [ ], [
+          AC_MSG_ERROR([no library containing aio routines found])
+       ])
+        AC_CACHE_CHECK([whether aio works], ac_cv_have_working_aio, [
+          cat > conftest.aio << EOF
+The quick brown fox jumps over the lazy dog.
+EOF
+          AC_TRY_RUN([
+#if HAVE_ERRNO_H
+# include <errno.h>
+#endif
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <aio.h>
+#include <stdio.h>
+
+main()
+{
+        struct aiocb    a;
+  const struct aiocb*   a_list = &a;
+        struct timespec a_timeout;
+
+  char buffer[32];
+
+  int i, rc, fd = open("conftest.aio", O_RDONLY);
+
+  if (fd < 0)
+    exit(1);
+
+  memset(&a, 0, sizeof(struct aiocb));
+
+  a.aio_fildes = fd;
+  a.aio_offset = 0;
+  a.aio_reqprio = 0;
+  a.aio_buf = buffer;
+  a.aio_nbytes = sizeof(buffer);
+  a.aio_sigevent.sigev_notify = SIGEV_NONE;
+
+  a_timeout.tv_sec = 1;
+  a_timeout.tv_nsec = 0;
+
+  if (aio_read(&a) < 0)
+    exit(1);
+
+  if (aio_suspend(&a_list, 1, &a_timeout) < 0)
+  {
+    #if HAVE_ERRNO_H
+    /* some linux systems don't await timeout and return instantly */
+    if (errno == EAGAIN)
+    {
+      nanosleep(&a_timeout, (struct timespec*) 0);
+      if (aio_suspend(&a_list, 1, &a_timeout) < 0)
+        exit(1);
+    }
+    else
+      exit(1);
+    #else
+    exit(1);
+    #endif
+  }
+
+  if (aio_error(&a) < 0)
+    exit(1);
+
+  if (aio_return(&a) < 0)
+    exit(1);
+
+  exit(0);
+}
+            ], ac_cv_have_working_aio=yes, ac_cv_have_working_aio=no)
+          ])
+        if test "$ac_cv_have_working_aio" = yes; then
+          AC_DEFINE(ENABLE_AIO, 1)
+        fi
+        rm -fr conftest*
+      fi
+    fi
+
+    if test "$ac_with_mtmalloc" = yes; then
+      AC_CHECK_HEADERS(mtmalloc.h)
+      AC_HAVE_LIBRARY(mtmalloc)
+    fi
+    ;;
+esac
+
+dnl Checks for compiler flags
+CFLAGS=""
+CPPFLAGS=""
+LDFLAGS=""
+
+if test "$ac_enable_optimized" = yes; then
+  case $target_cpu in
+  alpha*)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ALPHA"
+    ;;
+  arm*)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
+    ;;
+  ia64)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
+    ;;
+  i386)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
+    ;;
+  i486)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I486"
+    ;;
+  i586)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
+    ;;
+  i686)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+    ;;
+  ia64)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
+    ;;
+  powerpc)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
+    ;;
+  sparcv8)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
+    ;;
+  sparcv8plus*)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
+    CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
+    ;;
+  sparcv9)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
+    CFLAGS="$CFLAGS -Wa,-xarch=v9"
+    ;;
+  sparcv9a)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
+    CFLAGS="$CFLAGS -Wa,-xarch=v9a"
+    ;;
+  sparcv9b)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
+    CFLAGS="$CFLAGS -Wa,-xarch=v9b"
+    ;;
+  x86)
+  # QNX Neutrino doesn't list the exact cpu type
+    ;;
+  esac
+fi
+
+if test "$ac_enable_debug" = yes; then
+  CFLAGS="$CFLAGS -g"
+  if test "$ac_cv_prog_gcc" = yes; then
+    CFLAGS="$CFLAGS -Wall"
+  elif test "$ac_cv_prog_SUNPRO_CC" = yes; then
+    if test "$ac_enable_threads" = yes; then
+      CFLAGS="$CFLAGS -mt"
+    fi
+  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 -mcpu=i386 -march=i386 -fomit-frame-pointer"
+        ;;
+      i486)
+        CFLAGS="$CFLAGS -mcpu=i386 -march=i486 -fomit-frame-pointer"
+        ;;
+      i586)
+        CFLAGS="$CFLAGS -mcpu=i386 -march=i586 -fomit-frame-pointer"
+        ;;
+      i686)
+       CFLAGS="$CFLAGS -mcpu=i386  -march=i686 -fomit-frame-pointer"
+        ;;
+      sparc)
+        CFLAGS="$CFLAGS -m32 -mtune=ultrasparc"
+        ;;
+      sparcv8)
+        CFLAGS="$CFLAGS -mv8"
+        ;;
+# This actually performs WORSE on gcc up to 2.95.3!
+#     sparcv8plus*)
+#       CFLAGS="$CFLAGS -mv8plus"
+#       ;;
+      sparcv9*)
+        CFLAGS="$CFLAGS -m32 -mcpu=ultrasparc"
+        ;;
+      sparc64)
+        CFLAGS="$CFLAGS -m64 -mcpu=ultrasparc"
+        ;;
+      esac
+    fi
+  elif test "$ac_cv_prog_SUNPRO_CC" = yes; then
+    CFLAGS="$CFLAGS -fast"
+    if test "$ac_enable_threads" = yes; then
+      CFLAGS="$CFLAGS -mt"
+    fi
+    if test "$ac_enable_optimized" = yes; then
+      case $target_cpu in
+      sparcv8)
+        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8"
+        ;;
+      sparcv8plus)
+        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plus"
+        ;;
+      sparcv8plusa)
+        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plusa"
+        ;;
+      sparcv8plusb)
+        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plusb"
+        ;;
+      sparcv9)
+        CFLAGS="-xarch=v9"
+        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9"
+        LDFLAGS="$LDFLAGS -64"
+        ;;
+      sparcv9a)
+        CFLAGS="-xarch=v9"
+        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9a"
+        LDFLAGS="$LDFLAGS -64"
+        ;;
+      sparcv9b)
+        CFLAGS="-xarch=v9"
+        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9b"
+        LDFLAGS="$LDFLAGS -64"
+        ;;
+      esac
+    fi
+  elif test "$ac_cv_prog_DECC" = yes; then
+    CFLAGS="$CFLAGS -fast"
+    if test "$ac_enable_threads" = yes; then
+      CFLAGS="$CFLAGS -pthread"
+    fi
+  else
+    CFLAGS="$CFLAGS -O2"
+  fi
+fi
+
+case $target_os in
+  freebsd*)
+    if test "$ac_enable_threads" = yes; then
+      CFLAGS="$CFLAGS -pthread"
+      LDFLAGS="$LDFLAGS -pthread"
+    fi
+    ;;
+esac
+
+if test "$ac_with_javaglue" = yes ; then
+  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
+    ;;
+  darwin*)
+    ;;
+  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
+    ;;
+  solaris*)
+    CFLAGS="$CFLAGS -I$ac_cv_java_include"/solaris
+    ;;
+  *)
+    AC_MSG_WARN([please add appropriate -I$ac_cv_java_include/<operating system> flag])
+    ;;
+  esac
+fi
+
+dnl Checks for endianness
+AC_C_BIGENDIAN
+
+dnl Checks for word sizes
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(unsigned char)
+if test "$ac_cv_sizeof_char" -eq 1; then
+  AC_SUBST(int8_type, "char")
+else
+  AC_MSG_ERROR([compiler has no 1 byte char])
+fi
+if test "$ac_cv_sizeof_unsigned_char" -eq 1; then
+  AC_SUBST(uint8_type, "unsigned char")
+else
+  AC_MSG_ERROR([compiler has no 1 byte unsigned char])
+fi
+
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(unsigned short)
+if test "$ac_cv_sizeof_short" -eq 2; then
+  AC_SUBST(int16_type, "short")
+else
+  AC_MSG_ERROR([compiler has no 2 byte short])
+fi
+if test "$ac_cv_sizeof_unsigned_short" -eq 2; then
+  AC_SUBST(uint16_type, "unsigned short")
+else
+  AC_MSG_ERROR([compiler has no 2 byte unsigned short])
+fi
+
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(unsigned int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(unsigned long)
+if test "$ac_cv_sizeof_int" -eq 4; then
+  AC_SUBST(int32_type, "int")
+elif test "$ac_cv_sizeof_long" -eq 4; then
+  AC_SUBST(int32_type, "long")
+else
+  AC_MSG_ERROR([compiler has no 4 byte integer])
+fi
+if test "$ac_cv_sizeof_unsigned_int" -eq 4; then
+  AC_SUBST(uint32_type, "unsigned int")
+elif test "$ac_cv_sizeof_unsigned_long" -eq 4; then
+  AC_SUBST(uint32_type, "unsigned long")
+else
+  AC_MSG_ERROR([compiler has no 4 byte unsigned integer])
+fi
+
+if test "$ac_cv_sizeof_long" -eq 8; then
+  AC_SUBST(int64_type, "long")
+else
+  AC_CHECK_SIZEOF(long long)
+  if test "$ac_cv_sizeof_long_long" -eq 8; then
+    AC_DEFINE(HAVE_LONG_LONG)
+    AC_SUBST(int64_type, "long long")
+  else
+    AC_MSG_ERROR([compiler has no 8 byte integer])
+  fi
+fi
+if test "$ac_cv_sizeof_unsigned_long" -eq 8; then
+  AC_SUBST(uint64_type, "unsigned long")
+else
+  AC_CHECK_SIZEOF(unsigned long long)
+  if test "$ac_cv_sizeof_unsigned_long_long" -eq 8; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG)
+    AC_SUBST(uint64_type, "unsigned long long")
+  else
+    AC_MSG_ERROR([compiler has no 8 byte unsigned integer])
+  fi
+fi
+
+AC_CHECK_SIZEOF(float)
+if test "$ac_cv_sizeof_float" -eq 4; then
+  AC_SUBST(float4_type, "float")
+else
+  AC_MSG_ERROR([compiler has no 4 byte float])
+fi
+
+AC_CHECK_SIZEOF(double)
+if test "$ac_cv_sizeof_double" -eq 8; then
+  AC_SUBST(double8_type, "double")
+else
+  AC_MSG_ERROR([compiler has no 8 byte double])
+fi
+
+dnl Checks for devices
+AC_CHECKING(for specific entropy devices)
+case $target_os in
+  cygwin*)
+    AC_MSG_CHECKING([for wavein])
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING([for wincrypt])
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING([for console])
+    AC_MSG_RESULT(yes)
+    ;;
+  linux*)
+    AC_CACHE_CHECK([for /dev/dsp], ac_cv_have_dev_dsp, [
+      if test -r /dev/dsp; then
+        ac_cv_have_dev_dsp=yes
+      else
+        ac_cv_have_dev_dsp=no
+      fi
+      ])
+    if test "$ac_cv_have_dev_dsp" = yes; then
+      AC_DEFINE(HAVE_DEV_DSP, 1)
+    fi
+    ;;
+  solaris*)
+    AC_CACHE_CHECK([for /dev/audio], ac_cv_have_dev_audio, [
+      if test -r /dev/audio; then
+        ac_cv_have_dev_audio=yes
+      else
+        ac_cv_have_dev_audio=no
+      fi
+      ])
+    if test "$ac_cv_have_dev_audio" = yes; then
+      AC_DEFINE(HAVE_DEV_AUDIO, 1)
+    fi
+    ;;
+  *)
+    AC_MSG_WARN(no specific entropy devices present)
+    ;;
+esac
+
+case $target_os in
+  cygwin*)
+    ;;
+  *)
+    AC_CHECKING(for generic entropy devices)
+    AC_CACHE_CHECK([for /dev/random], ac_cv_have_dev_random, [
+      if test -r /dev/random; then
+        ac_cv_have_dev_random=yes
+      else
+        ac_cv_have_dev_random=no
+      fi
+      ])
+    if test "$ac_cv_have_dev_random" = yes; then
+      AC_DEFINE(HAVE_DEV_RANDOM, 1)
+    fi
+    AC_CACHE_CHECK([for /dev/urandom], ac_cv_have_dev_urandom, [
+      if test -r /dev/urandom; then
+        ac_cv_have_dev_urandom=yes
+      else
+        ac_cv_have_dev_urandom=no
+      fi
+      ])
+    if test "$ac_cv_have_dev_urandom" = yes; then
+      AC_DEFINE(HAVE_DEV_URANDOM, 1)
+    fi
+    AC_CACHE_CHECK([for /dev/tty], ac_cv_have_dev_tty, [
+      if test -r /dev/tty; then
+        ac_cv_have_dev_tty=yes
+      else
+        ac_cv_have_dev_tty=no
+      fi
+      ])
+    if test "$ac_cv_have_dev_tty" = yes; then
+      AC_DEFINE(HAVE_DEV_TTY, 1)
+    fi
+    ;;
+esac
+
+dnl Generate the assembler optimizations
+rm -f $srcdir/aesopt.c $srcdir/aesopt.S
+rm -f $srcdir/blowfishopt.c $srcdir/blowfishopt.S
+rm -f $srcdir/mp32opt.c $srcdir/mp32opt.S
+rm -f $srcdir/sha1opt.c $srcdir/sha1opt.S
+if test "$ac_enable_optimized" = yes; then
+  case $target_cpu in
+    arm*)
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.arm.S"
+EOF
+      ;;
+    i[[34]]86)
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.i386.S"
+EOF
+      ;;
+    i[[56]]86)
+      cat > $srcdir/aesopt.S << EOF
+#include "gas/aesopt.i586.S"
+EOF
+      cat > $srcdir/blowfishopt.S << EOF
+#include "gas/blowfishopt.i586.S"
+EOF
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.i386.S"
+EOF
+      cat > $srcdir/sha1opt.S << EOF
+#include "gas/sha1opt.i586.S"
+EOF
+      ;;
+    ia64)
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.ia64.S"
+EOF
+      ;;
+    powerpc)
+      cat > $srcdir/aesopt.S << EOF
+#include "gas/aesopt.powerpc.S"
+EOF
+      cat > $srcdir/blowfishopt.S << EOF
+#include "gas/blowfishopt.powerpc.S"
+EOF
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.powerpc.S"
+EOF
+      ;;
+    sparcv8)
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.sparcv8.S"
+EOF
+      ;;
+    sparcv8plus* | sparcv9*)
+      cat > $srcdir/mp32opt.S << EOF
+#include "gas/mp32opt.sparcv9.S"
+EOF
+      ;;
+  esac
+fi
+if test ! -r $srcdir/aesopt.S; then
+  cat > $srcdir/aesopt.c << EOF
+EOF
+fi
+if test ! -r $srcdir/blowfishopt.S; then
+  cat > $srcdir/blowfishopt.c << EOF
+EOF
+fi
+if test ! -r $srcdir/mp32opt.S; then
+  cat > $srcdir/mp32opt.c << EOF
+EOF
+fi
+if test ! -r $srcdir/sha1opt.S; then
+  cat > $srcdir/sha1opt.c << EOF
+EOF
+fi
+
+dnl Output
+AC_OUTPUT([ Doxyfile Makefile beecrypt.spec types.h
+       docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile
+       tests/Makefile ],
+  [     
+        echo timestamp > stamp-h.in
+  ]
+
+)
diff --git a/beecrypt/configure.in b/beecrypt/configure.in
deleted file mode 100644 (file)
index f71ab13..0000000
+++ /dev/null
@@ -1,822 +0,0 @@
-dnl Process this file with autoconf to produce a configure script
-
-dnl Initialization
-AC_INIT(beecrypt.c)
-AC_CANONICAL_SYSTEM
-AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(beecrypt, 2.2.0)
-AM_CONFIG_HEADER(config.h)
-
-dnl Automake
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-
-dnl Check system type
-case $target_os in
-  cygwin*)
-    AC_DEFINE(CYGWIN)
-    AC_DEFINE(WIN32)
-    ;;
-  darwin*)
-    AC_DEFINE(DARWIN)
-    ;;
-  freebsd*)
-    AC_DEFINE(FREEBSD)
-    ;;
-  linux*)
-    AC_DEFINE(LINUX)
-    ;;
-  netbsd*)
-    AC_DEFINE(NETBSD)
-    ;;
-  openbsd*)
-    AC_DEFINE(OPENBSD)
-    ;;
-  osf*)
-    AC_DEFINE(OSF)
-    ;;
-  *qnx)
-    AC_DEFINE(QNX)
-    ;;
-  solaris*)
-    AC_DEFINE(SOLARIS)
-    ;;
-  sysv*uv*)
-    AC_DEFINE(SCO_UNIX)
-    ;;
-  *)
-    AC_MSG_WARN([Operating system type $target_os currently not supported and/or tested])
-    ;;
-esac
-case $target_os in
-  cygwin* | darwin*)
-    AC_DEFINE(LEADING_UNDERSCORE)
-    ;;
-  *)
-    AC_DEFINE(NO_UNDERSCORES)
-    ;;
-esac
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_LN_S
-AM_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-
-AC_C_INLINE
-
-if test "$ac_cv_prog_gcc" != yes; then
-  AC_CACHE_CHECK([whether we are using Sun Workshop C], ac_cv_prog_SUNPRO_CC, [
-    AC_EGREP_CPP(yes, [
-      #ifdef __SUNPRO_C
-        yes;
-      #endif
-      ], ac_cv_prog_SUNPRO_CC=yes, ac_cv_prog_SUNPRO_CC=no)
-    ])
-  if test "$ac_cv_prog_SUNPRO_CC" != yes; then
-    AC_CACHE_CHECK([whether we are using Compaq's C compiler], ac_cv_prog_DECC, [
-      AC_EGREP_CPP(yes, [
-        #ifdef __DECC
-          yes;
-        #endif
-        ], ac_cv_prog_DECC=yes, ac_cv_prog_DECC=no)
-      ])
-  fi
-fi
-
-AC_ARG_ENABLE(debug, [  --enable-debug          creates debugging code [default=no]],
-  [ if test "$enableval" = no; then
-      ac_enable_debug=no
-    else
-      ac_enable_debug=yes
-    fi
-  ], [ ac_enable_debug=no])
-
-dnl Check if we need to disable optimizations
-AC_ARG_ENABLE(optimized, [  --enable-optimized      enables the assembler optimizations [default depends on --enable-debug value]],
-  [ if test "$enableval" = no; then
-      ac_enable_optimized=no
-    else
-      ac_enable_optimized=yes
-   fi
-  ],
-  [ if test "$ac_enable_debug" = no; then
-      ac_enable_optimized=yes
-    else
-      ac_enable_optimized=no
-    fi
-  ])
-
-dnl Check if we have the necessary java components installed
-AC_ARG_WITH(javaglue, [  --with-javaglue         creates the java glue code [default=yes]],
-  [ if test "$withval" = no; then
-      ac_with_javaglue=no
-    else
-      ac_with_javaglue=yes
-    fi
-  ], [ ac_with_javaglue=yes ])
-
-if test "$ac_with_javaglue" = yes ; then
-  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)
-  {
-     System.out.println(System.getProperty("java.home"));
-  }
-}
-EOF
-          java_home=`javac conftest.java; java -classpath . conftest`
-          case $target_os in
-          cygwin*)
-            java_home=`cygpath -u -p "$java_home"`
-            ;;
-          esac
-          if test -d "$ac_cv_java_include" ; then
-            ac_cv_java_headers=yes
-          else
-            case $target_os in
-            darwin*)
-              ac_cv_java_include="$java_home"/../../../Headers
-              ;;
-            *)
-              ac_cv_java_include="$java_home"/../include
-            esac
-            if test -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_MSG_WARN([javac not found, disabling javaglue])
-        ac_cv_java_headers=no
-        ac_with_javaglue=no
-      fi
-    fi
-  fi
-fi
-
-if test "$ac_with_javaglue" = yes ; then
-  AC_DEFINE(JAVAGLUE,1)
-else
-  AC_DEFINE(JAVAGLUE,0)
-fi
-
-dnl Check if we want to enable threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enables multithread safety [default=yes]],
-  [ if test "$enableval" = no; then
-      ac_enable_threads=no
-    else
-      ac_enable_threads=yes
-    fi
-  ], [ ac_enable_threads=yes ])
-
-dnl Check if we want to enable aio
-AC_ARG_ENABLE(aio, [  --enable-aio            enables asynchronous i/o for entropy gathering [default=yes]],
-  [ if test "$enableval" = no; then
-      ac_enable_aio=no
-    else
-      ac_enable_aio=yes
-    fi
-  ], [ ac_enable_aio=yes ])
-
-dnl Check if we want to use mtmalloc
-AC_ARG_WITH(mtmalloc, [  --with-mtmalloc         links against the mtmalloc library [default=no]],
-  [ if test "$withval" = no; then
-      ac_with_mtmalloc=no
-    else
-      ac_with_mtmalloc=yes
-    fi
-  ], [ ac_with_mtmalloc=no ])
-
-dnl Product and version
-AC_SUBST(CC)
-AC_SUBST(CPP)
-AC_SUBST(LD)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-
-dnl Checks for header files.
-AC_CHECK_HEADERS(errno.h string.h ctype.h stdlib.h)
-AC_CHECK_HEADERS(unistd.h fcntl.h)
-AC_CHECK_HEADERS(sys/types.h sys/stat.h)
-AC_CHECK_HEADERS(termio.h termios.h)
-AC_CHECK_HEADERS(sys/audioio.h sys/ioctl.h sys/soundcard.h)
-
-AC_CHECK_HEADERS(time.h sys/time.h)
-if test "$ac_cv_header_sys_time_h" = yes; then
-  AC_CHECK_FUNC(gettimeofday, [
-    AC_DEFINE(HAVE_GETTIMEOFDAY, 1)
-    ])
-  AC_CHECK_FUNC(gethrtime, [
-    AC_DEFINE(HAVE_GETHRTIME, 1)
-    ])
-fi
-
-case $target_os in
-  cygwin*)
-    ;;
-  *)
-    if test "$ac_enable_threads" = yes; then
-      AC_DEFINE(ENABLE_THREADS, 1)
-      AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
-      if test "$ac_cv_header_thread_h" = yes; then
-        AC_HAVE_LIBRARY(thread)
-      elif test  "$ac_cv_header_pthread_h" = yes; then
-        AC_HAVE_LIBRARY(pthread)
-      else
-        AC_MSG_WARN([Can't find any thread libraries])
-        AC_DEFINE(ENABLE_THREADS, 0)
-      fi
-    fi
-
-    if test "$ac_enable_aio" = yes; then
-      AC_CHECK_HEADERS(aio.h)
-      if test "$ac_cv_header_aio_h" = yes; then
-        AC_SEARCH_LIBS(aio_read, [c rt aio posix4], [ ], [
-          AC_MSG_ERROR([no library containing aio routines found])
-       ])
-        AC_CACHE_CHECK([whether aio works], ac_cv_have_working_aio, [
-          cat > conftest.aio << EOF
-The quick brown fox jumps over the lazy dog.
-EOF
-          AC_TRY_RUN([
-#if HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <aio.h>
-#include <stdio.h>
-
-main()
-{
-        struct aiocb    a;
-  const struct aiocb*   a_list = &a;
-        struct timespec a_timeout;
-
-  char buffer[32];
-
-  int i, rc, fd = open("conftest.aio", O_RDONLY);
-
-  if (fd < 0)
-    exit(1);
-
-  memset(&a, 0, sizeof(struct aiocb));
-
-  a.aio_fildes = fd;
-  a.aio_offset = 0;
-  a.aio_reqprio = 0;
-  a.aio_buf = buffer;
-  a.aio_nbytes = sizeof(buffer);
-  a.aio_sigevent.sigev_notify = SIGEV_NONE;
-
-  a_timeout.tv_sec = 1;
-  a_timeout.tv_nsec = 0;
-
-  if (aio_read(&a) < 0)
-    exit(1);
-
-  if (aio_suspend(&a_list, 1, &a_timeout) < 0)
-  {
-    #if HAVE_ERRNO_H
-    /* some linux systems don't await timeout and return instantly */
-    if (errno == EAGAIN)
-    {
-      nanosleep(&a_timeout, (struct timespec*) 0);
-      if (aio_suspend(&a_list, 1, &a_timeout) < 0)
-        exit(1);
-    }
-    else
-      exit(1);
-    #else
-    exit(1);
-    #endif
-  }
-
-  if (aio_error(&a) < 0)
-    exit(1);
-
-  if (aio_return(&a) < 0)
-    exit(1);
-
-  exit(0);
-}
-            ], ac_cv_have_working_aio=yes, ac_cv_have_working_aio=no)
-          ])
-        if test "$ac_cv_have_working_aio" = yes; then
-          AC_DEFINE(ENABLE_AIO, 1)
-        fi
-        rm -fr conftest*
-      fi
-    fi
-
-    if test "$ac_with_mtmalloc" = yes; then
-      AC_CHECK_HEADERS(mtmalloc.h)
-      AC_HAVE_LIBRARY(mtmalloc)
-    fi
-    ;;
-esac
-
-dnl Checks for compiler flags
-CFLAGS=""
-CPPFLAGS=""
-LDFLAGS=""
-
-if test "$ac_enable_optimized" = yes; then
-  case $target_cpu in
-  alpha*)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ALPHA"
-    ;;
-  arm*)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
-    ;;
-  ia64)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
-    ;;
-  i386)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
-    ;;
-  i486)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I486"
-    ;;
-  i586)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
-    ;;
-  i686)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
-    ;;
-  ia64)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
-    ;;
-  powerpc)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
-    ;;
-  sparcv8)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
-    ;;
-  sparcv8plus*)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
-    CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
-    ;;
-  sparcv9)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
-    CFLAGS="$CFLAGS -Wa,-xarch=v9"
-    ;;
-  sparcv9a)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
-    CFLAGS="$CFLAGS -Wa,-xarch=v9a"
-    ;;
-  sparcv9b)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
-    CFLAGS="$CFLAGS -Wa,-xarch=v9b"
-    ;;
-  x86)
-  # QNX Neutrino doesn't list the exact cpu type
-    ;;
-  esac
-fi
-
-if test "$ac_enable_debug" = yes; then
-  CFLAGS="$CFLAGS -g"
-  if test "$ac_cv_prog_gcc" = yes; then
-    CFLAGS="$CFLAGS -Wall"
-  elif test "$ac_cv_prog_SUNPRO_CC" = yes; then
-    if test "$ac_enable_threads" = yes; then
-      CFLAGS="$CFLAGS -mt"
-    fi
-  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 -mcpu=i386 -march=i386 -fomit-frame-pointer"
-        ;;
-      i486)
-        CFLAGS="$CFLAGS -mcpu=i386 -march=i486 -fomit-frame-pointer"
-        ;;
-      i586)
-        CFLAGS="$CFLAGS -mcpu=i386 -march=i586 -fomit-frame-pointer"
-        ;;
-      i686)
-       CFLAGS="$CFLAGS -mcpu=i386  -march=i686 -fomit-frame-pointer"
-        ;;
-      sparc)
-        CFLAGS="$CFLAGS -m32 -mtune=ultrasparc"
-        ;;
-      sparcv8)
-        CFLAGS="$CFLAGS -mv8"
-        ;;
-# This actually performs WORSE on gcc up to 2.95.3!
-#     sparcv8plus*)
-#       CFLAGS="$CFLAGS -mv8plus"
-#       ;;
-      sparcv9*)
-        CFLAGS="$CFLAGS -m32 -mcpu=ultrasparc"
-        ;;
-      sparc64)
-        CFLAGS="$CFLAGS -m64 -mcpu=ultrasparc"
-        ;;
-      esac
-    fi
-  elif test "$ac_cv_prog_SUNPRO_CC" = yes; then
-    CFLAGS="$CFLAGS -fast"
-    if test "$ac_enable_threads" = yes; then
-      CFLAGS="$CFLAGS -mt"
-    fi
-    if test "$ac_enable_optimized" = yes; then
-      case $target_cpu in
-      sparcv8)
-        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8"
-        ;;
-      sparcv8plus)
-        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plus"
-        ;;
-      sparcv8plusa)
-        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plusa"
-        ;;
-      sparcv8plusb)
-        CFLAGS="$CFLAGS -xtarget=generic -xarch=v8plusb"
-        ;;
-      sparcv9)
-        CFLAGS="-xarch=v9"
-        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9"
-        LDFLAGS="$LDFLAGS -64"
-        ;;
-      sparcv9a)
-        CFLAGS="-xarch=v9"
-        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9a"
-        LDFLAGS="$LDFLAGS -64"
-        ;;
-      sparcv9b)
-        CFLAGS="-xarch=v9"
-        CFLAGS="$CFLAGS -xtarget=generic64 -xarch=v9b"
-        LDFLAGS="$LDFLAGS -64"
-        ;;
-      esac
-    fi
-  elif test "$ac_cv_prog_DECC" = yes; then
-    CFLAGS="$CFLAGS -fast"
-    if test "$ac_enable_threads" = yes; then
-      CFLAGS="$CFLAGS -pthread"
-    fi
-  else
-    CFLAGS="$CFLAGS -O2"
-  fi
-fi
-
-case $target_os in
-  freebsd*)
-    if test "$ac_enable_threads" = yes; then
-      CFLAGS="$CFLAGS -pthread"
-      LDFLAGS="$LDFLAGS -pthread"
-    fi
-    ;;
-esac
-
-if test "$ac_with_javaglue" = yes ; then
-  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
-    ;;
-  darwin*)
-    ;;
-  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
-    ;;
-  solaris*)
-    CFLAGS="$CFLAGS -I$ac_cv_java_include"/solaris
-    ;;
-  *)
-    AC_MSG_WARN([please add appropriate -I$ac_cv_java_include/<operating system> flag])
-    ;;
-  esac
-fi
-
-dnl Checks for endianness
-AC_C_BIGENDIAN
-
-dnl Checks for word sizes
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(unsigned char)
-if test "$ac_cv_sizeof_char" -eq 1; then
-  AC_SUBST(int8_type, "char")
-else
-  AC_MSG_ERROR([compiler has no 1 byte char])
-fi
-if test "$ac_cv_sizeof_unsigned_char" -eq 1; then
-  AC_SUBST(uint8_type, "unsigned char")
-else
-  AC_MSG_ERROR([compiler has no 1 byte unsigned char])
-fi
-
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(unsigned short)
-if test "$ac_cv_sizeof_short" -eq 2; then
-  AC_SUBST(int16_type, "short")
-else
-  AC_MSG_ERROR([compiler has no 2 byte short])
-fi
-if test "$ac_cv_sizeof_unsigned_short" -eq 2; then
-  AC_SUBST(uint16_type, "unsigned short")
-else
-  AC_MSG_ERROR([compiler has no 2 byte unsigned short])
-fi
-
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(unsigned int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(unsigned long)
-if test "$ac_cv_sizeof_int" -eq 4; then
-  AC_SUBST(int32_type, "int")
-elif test "$ac_cv_sizeof_long" -eq 4; then
-  AC_SUBST(int32_type, "long")
-else
-  AC_MSG_ERROR([compiler has no 4 byte integer])
-fi
-if test "$ac_cv_sizeof_unsigned_int" -eq 4; then
-  AC_SUBST(uint32_type, "unsigned int")
-elif test "$ac_cv_sizeof_unsigned_long" -eq 4; then
-  AC_SUBST(uint32_type, "unsigned long")
-else
-  AC_MSG_ERROR([compiler has no 4 byte unsigned integer])
-fi
-
-if test "$ac_cv_sizeof_long" -eq 8; then
-  AC_SUBST(int64_type, "long")
-else
-  AC_CHECK_SIZEOF(long long)
-  if test "$ac_cv_sizeof_long_long" -eq 8; then
-    AC_DEFINE(HAVE_LONG_LONG)
-    AC_SUBST(int64_type, "long long")
-  else
-    AC_MSG_ERROR([compiler has no 8 byte integer])
-  fi
-fi
-if test "$ac_cv_sizeof_unsigned_long" -eq 8; then
-  AC_SUBST(uint64_type, "unsigned long")
-else
-  AC_CHECK_SIZEOF(unsigned long long)
-  if test "$ac_cv_sizeof_unsigned_long_long" -eq 8; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG)
-    AC_SUBST(uint64_type, "unsigned long long")
-  else
-    AC_MSG_ERROR([compiler has no 8 byte unsigned integer])
-  fi
-fi
-
-AC_CHECK_SIZEOF(float)
-if test "$ac_cv_sizeof_float" -eq 4; then
-  AC_SUBST(float4_type, "float")
-else
-  AC_MSG_ERROR([compiler has no 4 byte float])
-fi
-
-AC_CHECK_SIZEOF(double)
-if test "$ac_cv_sizeof_double" -eq 8; then
-  AC_SUBST(double8_type, "double")
-else
-  AC_MSG_ERROR([compiler has no 8 byte double])
-fi
-
-dnl Checks for devices
-AC_CHECKING(for specific entropy devices)
-case $target_os in
-  cygwin*)
-    AC_MSG_CHECKING([for wavein])
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([for wincrypt])
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([for console])
-    AC_MSG_RESULT(yes)
-    ;;
-  linux*)
-    AC_CACHE_CHECK([for /dev/dsp], ac_cv_have_dev_dsp, [
-      if test -r /dev/dsp; then
-        ac_cv_have_dev_dsp=yes
-      else
-        ac_cv_have_dev_dsp=no
-      fi
-      ])
-    if test "$ac_cv_have_dev_dsp" = yes; then
-      AC_DEFINE(HAVE_DEV_DSP, 1)
-    fi
-    ;;
-  solaris*)
-    AC_CACHE_CHECK([for /dev/audio], ac_cv_have_dev_audio, [
-      if test -r /dev/audio; then
-        ac_cv_have_dev_audio=yes
-      else
-        ac_cv_have_dev_audio=no
-      fi
-      ])
-    if test "$ac_cv_have_dev_audio" = yes; then
-      AC_DEFINE(HAVE_DEV_AUDIO, 1)
-    fi
-    ;;
-  *)
-    AC_MSG_WARN(no specific entropy devices present)
-    ;;
-esac
-
-case $target_os in
-  cygwin*)
-    ;;
-  *)
-    AC_CHECKING(for generic entropy devices)
-    AC_CACHE_CHECK([for /dev/random], ac_cv_have_dev_random, [
-      if test -r /dev/random; then
-        ac_cv_have_dev_random=yes
-      else
-        ac_cv_have_dev_random=no
-      fi
-      ])
-    if test "$ac_cv_have_dev_random" = yes; then
-      AC_DEFINE(HAVE_DEV_RANDOM, 1)
-    fi
-    AC_CACHE_CHECK([for /dev/urandom], ac_cv_have_dev_urandom, [
-      if test -r /dev/urandom; then
-        ac_cv_have_dev_urandom=yes
-      else
-        ac_cv_have_dev_urandom=no
-      fi
-      ])
-    if test "$ac_cv_have_dev_urandom" = yes; then
-      AC_DEFINE(HAVE_DEV_URANDOM, 1)
-    fi
-    AC_CACHE_CHECK([for /dev/tty], ac_cv_have_dev_tty, [
-      if test -r /dev/tty; then
-        ac_cv_have_dev_tty=yes
-      else
-        ac_cv_have_dev_tty=no
-      fi
-      ])
-    if test "$ac_cv_have_dev_tty" = yes; then
-      AC_DEFINE(HAVE_DEV_TTY, 1)
-    fi
-    ;;
-esac
-
-dnl Generate the assembler optimizations
-rm -f $srcdir/aesopt.c $srcdir/aesopt.S
-rm -f $srcdir/blowfishopt.c $srcdir/blowfishopt.S
-rm -f $srcdir/mp32opt.c $srcdir/mp32opt.S
-rm -f $srcdir/sha1opt.c $srcdir/sha1opt.S
-if test "$ac_enable_optimized" = yes; then
-  case $target_cpu in
-    arm*)
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.arm.S"
-EOF
-      ;;
-    i[[34]]86)
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.i386.S"
-EOF
-      ;;
-    i[[56]]86)
-      cat > $srcdir/aesopt.S << EOF
-#include "gas/aesopt.i586.S"
-EOF
-      cat > $srcdir/blowfishopt.S << EOF
-#include "gas/blowfishopt.i586.S"
-EOF
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.i386.S"
-EOF
-      cat > $srcdir/sha1opt.S << EOF
-#include "gas/sha1opt.i586.S"
-EOF
-      ;;
-    ia64)
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.ia64.S"
-EOF
-      ;;
-    powerpc)
-      cat > $srcdir/aesopt.S << EOF
-#include "gas/aesopt.powerpc.S"
-EOF
-      cat > $srcdir/blowfishopt.S << EOF
-#include "gas/blowfishopt.powerpc.S"
-EOF
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.powerpc.S"
-EOF
-      ;;
-    sparcv8)
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.sparcv8.S"
-EOF
-      ;;
-    sparcv8plus* | sparcv9*)
-      cat > $srcdir/mp32opt.S << EOF
-#include "gas/mp32opt.sparcv9.S"
-EOF
-      ;;
-  esac
-fi
-if test ! -r $srcdir/aesopt.S; then
-  cat > $srcdir/aesopt.c << EOF
-EOF
-fi
-if test ! -r $srcdir/blowfishopt.S; then
-  cat > $srcdir/blowfishopt.c << EOF
-EOF
-fi
-if test ! -r $srcdir/mp32opt.S; then
-  cat > $srcdir/mp32opt.c << EOF
-EOF
-fi
-if test ! -r $srcdir/sha1opt.S; then
-  cat > $srcdir/sha1opt.c << EOF
-EOF
-fi
-
-dnl Output
-AC_OUTPUT([ Doxyfile Makefile beecrypt.spec types.h
-       docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile
-       tests/Makefile ],
-  [     
-        echo timestamp > stamp-h.in
-  ]
-
-)
index f287a9bdc23ce56892b22b96d90216eccb20a58f..1f383b070e9ec844b41b824c977b7946264e1d00 100644 (file)
@@ -139,7 +139,7 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  docs/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
index f987868c5d0f2117a8010119f224750425646b37..b3bffc6fa8befae40a3aa0ec11c417f6bc190e7a 100644 (file)
@@ -139,7 +139,7 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  gas/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
index a90e1d368bd69a3d96803eb654a7511f87f7e6e2..b3dbd979ed6d51106559ab8a4e62297a01f9ae73 100644 (file)
@@ -139,7 +139,7 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  masm/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
index 2ff4d6b9f11ec4fd65dd1e92a87131955929de3a..e7850353eb15b67f658f3c23821f4bc961601b23 100644 (file)
@@ -139,7 +139,7 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  mwerks/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
index d2bcde2a74736557bdb39ec705e06d84454166a1..17485bc47f7569e7bd1d5988cde2d3f99ff62522 100644 (file)
@@ -225,7 +225,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  tests/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status