diff options
| author | Badlop <badlop@process-one.net> | 2013-04-11 17:12:53 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2013-04-11 17:12:53 +0200 |
| commit | c7eaa9aeacaa3bb4493f43eb9ab62091b001eb1d (patch) | |
| tree | 0e7290f7a120b8d22087ee8b145f3799af766d31 /src/acinclude.m4 | |
| parent | Merge pull request #57 from rraptorr/carboncopy (diff) | |
ejabberd 13 requires Erlang/OTP R15B or higher (EJAB-1630)
Fix documents and remove useless code.
Diffstat (limited to 'src/acinclude.m4')
| -rw-r--r-- | src/acinclude.m4 | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/acinclude.m4 b/src/acinclude.m4 index 62b40ab2..79c226a6 100644 --- a/src/acinclude.m4 +++ b/src/acinclude.m4 @@ -126,17 +126,9 @@ start() -> EIDirS = code:lib_dir("erl_interface") ++ "\n", EILibS = libpath("erl_interface") ++ "\n", RootDirS = code:root_dir() ++ "\n", - file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)), + file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)), halt(). -ssldef() -> - OTP = (catch erlang:system_info(otp_release)), - if - OTP >= "R14" -> "-DSSL40\n"; - OTP >= "R12" -> "-DSSL39\n"; - true -> "\n" - end. - %% return physical architecture based on OS/Processor archname() -> ArchStr = erlang:system_info(system_architecture), @@ -184,8 +176,6 @@ _EOF ERLANG_EI_DIR=`cat conftest.out | head -n 1` # Second line ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` - # Third line - ERLANG_SSLVER=`cat conftest.out | head -n 3 | tail -n 1` # End line ERLANG_DIR=`cat conftest.out | tail -n 1` @@ -194,7 +184,6 @@ _EOF AC_SUBST(ERLANG_CFLAGS) AC_SUBST(ERLANG_LIBS) - AC_SUBST(ERLANG_SSLVER) AC_SUBST(ERLC) AC_SUBST(ERL) ]) |