Another RPM & patches.

Geoff Wong <>
Thu Feb 3 01:26:16 CET 2000


Hmm - one more thing and I'll stop mailing :-).
After going to all the trouble to fix configure.in to
check for OpenSSL I forgot to include the patch for
configure itself (of course you could manually run autoconf -
but that's not so good for an RPM).

Although this may clash with the other patch to configure. 
So they probably should be combined into a single patch.


Geoff


---------------- cut here (local_patch_R6B0.16.txt)

--- erts/autoconf/configure.ORIG	Thu Feb  3 11:20:10 2000
+++ erts/autoconf/configure	Thu Feb  3 11:20:14 2000
@@ -1278,7 +1278,7 @@
 done
 test -n "$YACC" || YACC="yacc"
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4288,20 +4288,104 @@
 
 
 
-SSLEAY_ROOT=
-if test -d ${ERL_TOP}/lib/ssl/usr/ssleay; then
-  SSLEAY_ROOT='$(ERL_TOP)/ssl/usr/ssleay/$(TARGET)'
+ac_safe=`echo "/usr/local/ssl/include/openssl/opensslv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for /usr/local/ssl/include/openssl/opensslv.h""... $ac_c" 1>&6
+echo "configure:4294: checking for /usr/local/ssl/include/openssl/opensslv.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "I could not find ssleay" > ${ERL_TOP}/lib/crypto/SKIP
+  cat > conftest.$ac_ext <<EOF
+#line 4299 "configure"
+#include "confdefs.h"
+#include </usr/local/ssl/include/openssl/opensslv.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_cv_openssl=yes
+else
+  echo "$ac_t""no" 1>&6
+ac_cv_openssl=no
 fi
 
+if test $ac_cv_openssl = yes ; then
+    SSLEAY_ROOT=/usr/local/ssl/
+    SSL_INCLUDE='-I/usr/local/ssl/include/openssl -I/usr/local/ssl/include'
+else
+    ac_safe=`echo "/usr/ssl/include/openssl/opensslv.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for /usr/ssl/include/openssl/opensslv.h""... $ac_c" 1>&6
+echo "configure:4332: checking for /usr/ssl/include/openssl/opensslv.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4337 "configure"
+#include "confdefs.h"
+#include </usr/ssl/include/openssl/opensslv.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_cv_openssl=yes
+else
+  echo "$ac_t""no" 1>&6
+ac_cv_openssl=no
+fi
+
+    if test $ac_cv_openssl = yes ; then
+        SSLEAY_ROOT=/usr/ssl/
+        SSL_INCLUDE='-I/usr/ssl/include/openssl -I/usr/ssl/include'
+        else 
+        if test -d ${ERL_TOP}/lib/ssl/usr/ssleay; then
+            SSLEAY_ROOT='$(ERL_TOP)/ssl/usr/ssleay/$(TARGET)'
+            SSL_INCLUDE='-I$(ERL_TOP)/lib/ssl/usr/ssleay/include'
+        else
+            SSLEAY_ROOT=
+            SSL_INCLUDE=
+            echo "configure: warning: OpenSSL or SSleay not found, will build without SSL support" 1>&2
+            echo "I could not find OpenSSL or SSLeay" > $(ERL_TOP)/lib/crypto/SKIP
+        fi
+    fi
+fi
+
+
+
+
 
 #--------------------------------------------------------------------
 # Os mon stuff.
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:4305: checking for kstat_open in -lkstat" >&5
+echo "configure:4389: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4309,7 +4393,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkstat  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4313 "configure"
+#line 4397 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4320,7 +4404,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4349,7 +4433,7 @@
 # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4353: checking for $ac_word" >&5
+echo "configure:4437: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_JAVAC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4392,7 +4476,7 @@
 # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4396: checking for $ac_word" >&5
+echo "configure:4480: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4643,6 +4727,7 @@
 s%@DED_LD@%$DED_LD%g
 s%@DED_LDFLAGS@%$DED_LDFLAGS%g
 s%@ded_soname@%$ded_soname%g
+s%@SSL_INCLUDE@%$SSL_INCLUDE%g
 s%@SSLEAY_ROOT@%$SSLEAY_ROOT%g
 s%@os_mon_programs@%$os_mon_programs%g
 s%@JAVAC@%$JAVAC%g




More information about the erlang-questions mailing list