Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Recompile the 'configure' script

This commit is contained in:
Badlop 2010-07-12 15:18:15 +02:00
parent 12e00c57f9
commit d539fd28c1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/configure vendored
View File

@ -648,7 +648,7 @@ EGREP
GREP GREP
CPP CPP
LIBICONV LIBICONV
ERLANG_SSL39 ERLANG_SSLVER
ERLANG_LIBS ERLANG_LIBS
ERLANG_CFLAGS ERLANG_CFLAGS
ERL ERL
@ -3211,7 +3211,6 @@ fi
-author('alexey@sevcom.net'). -author('alexey@sevcom.net').
-export([start/0]). -export([start/0]).
-include_lib("ssl/include/ssl_pkix.hrl").
start() -> start() ->
EIDirS = code:lib_dir("erl_interface") ++ "\n", EIDirS = code:lib_dir("erl_interface") ++ "\n",
@ -3220,11 +3219,13 @@ start() ->
file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
halt(). halt().
-ifdef('id-pkix'). ssldef() ->
ssldef() -> "-DSSL39\n". OTP = (catch erlang:system_info(otp_release)),
-else. if
ssldef() -> "\n". OTP >= "R14" -> "-DSSL40\n";
-endif. OTP >= "R12" -> "-DSSL39\n";
true -> ""
end.
%% return physical architecture based on OS/Processor %% return physical architecture based on OS/Processor
archname() -> archname() ->
@ -3274,7 +3275,7 @@ _EOF
# Second line # Second line
ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
# Third line # Third line
ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1` ERLANG_SSLVER=`cat conftest.out | head -n 3 | tail -n 1`
# End line # End line
ERLANG_DIR=`cat conftest.out | tail -n 1` ERLANG_DIR=`cat conftest.out | tail -n 1`