Teach autogen.sh about beecrypt.

Use rpm optflags when compiling beecrypt.

CVS patchset: 5275
CVS date: 2002/01/28 15:08:56

diff --git a/autogen.sh b/autogen.sh
index 8dc5cb2..5a09e3a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,6 +22,7 @@ recent versions of libtool/autoconf/automake.
 
 (cd popt; ./autogen.sh --noconfigure "$@")
 (cd zlib; ./autogen.sh --noconfigure "$@")
+(cd beecrypt; ./autogen.sh --noconfigure "$@")
 libtoolize --copy --force
 aclocal
 autoheader

diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in
index bf2818f..d33dbd8 100644 (file)
--- a/beecrypt/config.gnu.h.in
+++ b/beecrypt/config.gnu.h.in
@@ -193,12 +193,8 @@
 #undef HAVE_LIBTHREAD
 
 /* Name of package */
-#if !defined(PACKAGE)
 #undef PACKAGE
-#endif
 
 /* Version number of package */
-#if !defined(VERSION)
 #undef VERSION
-#endif
 

diff --git a/beecrypt/configure.in b/beecrypt/configure.in
index 2b06042..e6adfe2 100644 (file)
--- a/beecrypt/configure.in
+++ b/beecrypt/configure.in
@@ -424,16 +424,19 @@ else
         CFLAGS="$CFLAGS -fomit-frame-pointer"
         ;;
       i386)
-        CFLAGS="$CFLAGS -m386 -march=i386 -fomit-frame-pointer"
+        CFLAGS="$CFLAGS -mcpu=i386 -march=i386 -fomit-frame-pointer"
         ;;
       i486)
-        CFLAGS="$CFLAGS -m486 -march=i486 -fomit-frame-pointer"
+        CFLAGS="$CFLAGS -mcpu=i386 -march=i486 -fomit-frame-pointer"
         ;;
       i586)
-        CFLAGS="$CFLAGS -mpentium -march=pentium -fomit-frame-pointer"
+        CFLAGS="$CFLAGS -mcpu=i386 -march=i586 -fomit-frame-pointer"
         ;;
       i686)
-       CFLAGS="$CFLAGS -mpentiumpro -march=pentiumpro -fomit-frame-pointer"
+       CFLAGS="$CFLAGS -mcpu=i386  -march=i686 -fomit-frame-pointer"
+        ;;
+      sparc)
+        CFLAGS="$CFLAGS -m32 -mtune=ultrasparc"
         ;;
       sparcv8)
         CFLAGS="$CFLAGS -mv8"
@@ -443,8 +446,10 @@ else
 #       CFLAGS="$CFLAGS -mv8plus"
 #       ;;
       sparcv9*)
-        AC_MSG_WARN([gcc currently cannot build 64-bit objects])
-        CFLAGS="$CFLAGS -mcpu=v9 -m64 -mptr64"
+        CFLAGS="$CFLAGS -m32 -mcpu=ultrasparc"
+        ;;
+      sparc64)
+        CFLAGS="$CFLAGS -m64 -mcpu=ultrasparc"
         ;;
       esac
     fi