ChangeLog, build, flock-build:

  * build (RSASUF): If we have rsaref2/ and are building
  --without-rsaref, note it as a build-directory suffix.

bk: 38cf0de8oHtDIF7E2rDOFi8Y0JqFlQ

diff --git a/ChangeLog b/ChangeLog
index e21f198aca047d6d4cc2d374f658134d72afdcba..4ab109a377f2deb98ff5e8916abc572fcaf8e048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-14  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * build (RSASUF): If we have rsaref2/ and are building
+       --without-rsaref, note it as a build-directory suffix.
+
        * configure.in: 4.0.99h
        Crypto merge
 

diff --git a/build b/build
index 8caf6413a7e5a071b415f89409af52ef0007acdb..33de35e61c4b33e316cea0fb84d8ec1c56219555 100755 (executable)
--- a/build
+++ b/build
@@ -28,6 +28,14 @@ case "$IAM" in
     ;;
 esac
 
+RSASUF=""
+
+case "$CONFIG_ARGS" in
+ *--without-rsaref*)
+    [ -d rsaref2 ] && RSASUF="-norsa"
+    ;;
+esac
+
 CCSUF=""
 
 case "$CC" in
@@ -36,7 +44,7 @@ case "$CC" in
     ;;
 esac
 
-BDIR="$BDIR$CCSUF"
+BDIR="$BDIR$RSASUF$CCSUF"
 
 [ -d "$BDIR" ] || mkdir $BDIR
 [ -f "$BDIR/.buildcvo" ] || echo $CVO > $BDIR/.buildcvo

diff --git a/flock-build b/flock-build
index acff10ec43d3e45a13ce391cd3faef5657241d5b..7cb68fe515f0eaeabb8aa336865d1c138415f35a 100755 (executable)
--- a/flock-build
+++ b/flock-build
@@ -2,17 +2,17 @@
 
 BUILD_ARGS="$@"
 
-#  bridgeport      sparc-sun-solaris2.6
-#  bunnylou        alpha-dec-osf4.0
-#  churchy         alpha-dec-osf4.0
-#  cowbird         alpha-dec-osf4.0
-#  grundoon        sparc-sun-sunos4.1.3
-#  hepzibah        freebsd-2.2.5
-#  pogo            sparc-sun-solaris2.6
-#  porkypine       mips-dec-ultrix4.4
-#  rackety         sparc-sun-sunos4.1.3/cc
-#  snavely         hppa1.1-hp-hpux10.20
-#  whimsy          sparc-sun-solaris2.6
+#   bridgeport     sparc-sun-solaris2.6
+#   bunnylou       alpha-dec-osf4.0
+# * churchy        alpha-dec-osf4.0
+#   cowbird        alpha-dec-osf4.0
+#   grundoon       sparc-sun-sunos4.1.3
+# * hepzibah       freebsd-2.2.5
+# * pogo           sparc-sun-solaris2.6
+# * porkypine      mips-dec-ultrix4.4
+# * rackety        sparc-sun-sunos4.1.3/cc
+# * snavely        hppa1.1-hp-hpux10.20
+#   whimsy         sparc-sun-solaris2.6
 
 c_d=`pwd`