R7B Open Source Erlang available for download

Geoff Wong <>
Sun Oct 1 01:44:27 CEST 2000


Here's a set of patches to R7B-0 that enables it compile the 
ssl and crypto library modules with OpenSSL (installed separately).

Geoff

--- erts/autoconf/configure.in	Sun Oct  1 10:25:23 2000
+++ erts/autoconf/configure.in.ORIG	Sun Oct  1 10:17:38 2000
@@ -580,33 +580,16 @@
 AC_SUBST(ded_soname)
 
 dnl
-dnl SSL and CRYPTO needs the library openSSL/ssleay
+dnl SSL and CRYPTO needs the library ssleay
 dnl
+AC_SUBST(SSLEAY_ROOT)
 SSLEAY_ROOT=
-SSL_INCLUDE=
 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'
-    AC_SUBST(SSL_INCLUDE)
-    AC_SUBST(SSLEAY_ROOT)
+  SSLEAY_ROOT='$(ERL_TOP)/lib/ssl/usr/ssleay/$(TARGET)'
 else
-    echo "I could not find OpenSSL or SSLeay" > ${ERL_TOP}/lib/ssl/SKIP
-    echo "I could not find OpenSSL or SSLeay" > ${ERL_TOP}/lib/crypto/SKIP
-    for dir in /usr /usr/pkg /usr/local /usr/local/ssl /usr/lib/ssl /usr/ssl; do
-        AC_CHECK_HEADER($dir/include/openssl/opensslv.h, ac_cv_openssl=yes, ac_cv_openssl=no)
-        if test $ac_cv_openssl = yes ; then
-            SSLEAY_ROOT="$dir"
-            SSL_INCLUDE="-I$dir/include/openssl -I$dir/include"
-            /bin/rm ${ERL_TOP}/lib/ssl/SKIP
-            /bin/rm ${ERL_TOP}/lib/crypto/SKIP
-            AC_SUBST(SSL_INCLUDE)
-            AC_SUBST(SSLEAY_ROOT)
-        fi
-    done
+  echo "I could not find ssleay" > ${ERL_TOP}/lib/ssl/SKIP
+  echo "I could not find ssleay" > ${ERL_TOP}/lib/crypto/SKIP
 fi
-
-AC_SUBST(SSL_INCLUDE)
-AC_SUBST(SSLEAY_ROOT)
 
 
 #--------------------------------------------------------------------
--- erts/autoconf/configure	Sun Oct  1 10:25:45 2000
+++ erts/autoconf/configure.ORIG	Sun Oct  1 10:28:58 2000
@@ -1366,7 +1366,7 @@
 done
 test -n "$YACC" || YACC="yacc"
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk 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
@@ -4417,72 +4417,22 @@
 
 
 
+
 SSLEAY_ROOT=
-SSL_INCLUDE=
 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
-    echo "I could not find OpenSSL or SSLeay" > ${ERL_TOP}/lib/ssl/SKIP
-    echo "I could not find OpenSSL or SSLeay" > ${ERL_TOP}/lib/crypto/SKIP
-    for dir in /usr /usr/pkg /usr/local /usr/local/ssl /usr/lib/ssl /usr/ssl; do
-        ac_safe=`echo "$dir/include/openssl/opensslv.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $dir/include/openssl/opensslv.h""... $ac_c" 1>&6
-echo "configure:4434: checking for $dir/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 4439 "configure"
-#include "confdefs.h"
-#include <$dir/include/openssl/opensslv.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4444: \"$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
+  SSLEAY_ROOT='$(ERL_TOP)/lib/ssl/usr/ssleay/$(TARGET)'
 else
-  echo "$ac_t""no" 1>&6
-ac_cv_openssl=no
-fi
-
-        if test $ac_cv_openssl = yes ; then
-            SSLEAY_ROOT="$dir"
-            SSL_INCLUDE="-I$dir/include/openssl -I$dir/include"
-            /bin/rm ${ERL_TOP}/lib/ssl/SKIP
-            /bin/rm ${ERL_TOP}/lib/crypto/SKIP
-            
-            
-        fi
-    done
+  echo "I could not find ssleay" > ${ERL_TOP}/lib/ssl/SKIP
+  echo "I could not find ssleay" > ${ERL_TOP}/lib/crypto/SKIP
 fi
 
 
-
-
-
 #--------------------------------------------------------------------
 # Os mon stuff.
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:4486: checking for kstat_open in -lkstat" >&5
+echo "configure:4436: 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
@@ -4490,7 +4440,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkstat  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4494 "configure"
+#line 4444 "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
@@ -4501,7 +4451,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4455: \"$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
@@ -4532,7 +4482,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4536: checking for $ac_word" >&5
+echo "configure:4486: 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
@@ -4563,7 +4513,7 @@
 
 if test -n "$JAVAC"; then
     echo $ac_n "checking for JDK version 1.2""... $ac_c" 1>&6
-echo "configure:4567: checking for JDK version 1.2" >&5
+echo "configure:4517: checking for JDK version 1.2" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_javac_ver_1_2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4574,7 +4524,7 @@
    java.util.Iterator iter;
    ; return; }}
 EOF
-if { (eval echo configure:4578: \"$java_link\") 1>&5; (eval $java_link) 2>&5; } && test -s conftest.class; then
+if { (eval echo configure:4528: \"$java_link\") 1>&5; (eval $java_link) 2>&5; } && test -s conftest.class; then
    rm -rf conftest*
    ac_cv_prog_javac_ver_1_2=yes
 else
@@ -4608,7 +4558,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:4612: checking for $ac_word" >&5
+echo "configure:4562: 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
@@ -4861,7 +4811,6 @@
 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
--- lib/crypto/c_src/Makefile.in	Sun Oct  1 10:30:28 2000
+++ lib/crypto/c_src/Makefile.in.ORIG	Thu Sep 14 21:27:12 2000
@@ -48,11 +48,11 @@
 SSLEAY_ROOT = @SSLEAY_ROOT@
 
 SSLEAY_LIBDIR = $(SSLEAY_ROOT)/lib
-SSLEAY_INCDIR = @SSL_INCLUDE@
+SSLEAY_INCDIR = $(SSLEAY_ROOT)/include
 # For erl_driver.h
 SYS_INCDIR = $(ERL_TOP)/erts/emulator/beam
 
-INCLUDES = $(SSLEAY_INCDIR) -I $(SYS_INCDIR)
+INCLUDES = -I $(SSLEAY_INCDIR) -I $(SYS_INCDIR)
 
 ifeq ($(TYPE),debug)
 TYPEMARKER = .debug
--- lib/ssl/c_src/Makefile.in	Sun Oct  1 10:35:19 2000
+++ lib/ssl/c_src/Makefile.in.ORIG	Sun Oct  1 10:33:34 2000
@@ -41,8 +41,8 @@
 # ----------------------------------------------------
 # Includes and libs
 # ----------------------------------------------------
-SSLEAY_INCLUDE = @SSL_INCLUDE@
-SSLEAY_LIBDIR = $(SSLEAY_ROOT)/lib
+SSLEAY_INCLUDE = -I $(SSLEAY_ROOT)/$(TARGET)/include
+SSLEAY_LIBDIR = $(SSLEAY_ROOT)/$(TARGET)/lib
 
 ALL_CFLAGS = @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
 TARGET = @host@



More information about the erlang-questions mailing list