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

Do not check for Erlang apps at configure time as it looks redundant

This commit is contained in:
Evgeniy Khramtsov 2013-11-17 15:09:54 +10:00
parent 792b5a24df
commit 2d6a838905
2 changed files with 9 additions and 849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

833
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.67 for ejabberd community 14.05-120-gedfb5fc.
# Generated by GNU Autoconf 2.67 for ejabberd community 14.05-128-g792b5a2.
#
# Report bugs to <ejabberd@process-one.net>.
#
@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ejabberd'
PACKAGE_TARNAME='ejabberd'
PACKAGE_VERSION='community 14.05-120-gedfb5fc'
PACKAGE_STRING='ejabberd community 14.05-120-gedfb5fc'
PACKAGE_VERSION='community 14.05-128-g792b5a2'
PACKAGE_STRING='ejabberd community 14.05-128-g792b5a2'
PACKAGE_BUGREPORT='ejabberd@process-one.net'
PACKAGE_URL=''
@ -578,26 +578,6 @@ full_xml
transient_supervisors
roster_gateway_workaround
hipe
ERLANG_LIB_VER_runtime_tools
ERLANG_LIB_DIR_runtime_tools
ERLANG_LIB_VER_tools
ERLANG_LIB_DIR_tools
ERLANG_LIB_VER_odbc
ERLANG_LIB_DIR_odbc
ERLANG_LIB_VER_compiler
ERLANG_LIB_DIR_compiler
ERLANG_LIB_VER_inets
ERLANG_LIB_DIR_inets
ERLANG_LIB_VER_mnesia
ERLANG_LIB_DIR_mnesia
ERLANG_LIB_VER_ssl
ERLANG_LIB_DIR_ssl
ERLANG_LIB_VER_public_key
ERLANG_LIB_DIR_public_key
ERLANG_LIB_VER_crypto
ERLANG_LIB_DIR_crypto
ERLANG_LIB_VER_sasl
ERLANG_LIB_DIR_sasl
INSTALLUSER
MAKE
ESCRIPT
@ -1222,7 +1202,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ejabberd community 14.05-120-gedfb5fc to adapt to many kinds of systems.
\`configure' configures ejabberd community 14.05-128-g792b5a2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1283,7 +1263,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ejabberd community 14.05-120-gedfb5fc:";;
short | recursive ) echo "Configuration of ejabberd community 14.05-128-g792b5a2:";;
esac
cat <<\_ACEOF
@ -1407,7 +1387,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ejabberd configure community 14.05-120-gedfb5fc
ejabberd configure community 14.05-128-g792b5a2
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@ -1466,7 +1446,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ejabberd $as_me community 14.05-120-gedfb5fc, which was
It was created by ejabberd $as_me community 14.05-128-g792b5a2, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@ -3048,801 +3028,6 @@ if test "$ENABLEUSER" != ""; then
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'sasl' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'sasl' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_sasl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("sasl") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_sasl=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_sasl="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_sasl" >&5
$as_echo "$ac_cv_erlang_lib_dir_sasl" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'sasl' library version" >&5
$as_echo_n "checking for Erlang/OTP 'sasl' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_sasl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_sasl" = "not found"; then :
ac_cv_erlang_lib_ver_sasl="not found"
else
ac_cv_erlang_lib_ver_sasl=`$as_echo "$ac_cv_erlang_lib_dir_sasl" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_sasl" >&5
$as_echo "$ac_cv_erlang_lib_ver_sasl" >&6; }
ERLANG_LIB_DIR_sasl=$ac_cv_erlang_lib_dir_sasl
ERLANG_LIB_VER_sasl=$ac_cv_erlang_lib_ver_sasl
if test "$ac_cv_erlang_lib_dir_sasl" = "not found"; then :
as_fn_error $? "Erlang application 'sasl' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'crypto' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'crypto' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_crypto+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("crypto") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_crypto=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_crypto="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_crypto" >&5
$as_echo "$ac_cv_erlang_lib_dir_crypto" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'crypto' library version" >&5
$as_echo_n "checking for Erlang/OTP 'crypto' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_crypto+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_crypto" = "not found"; then :
ac_cv_erlang_lib_ver_crypto="not found"
else
ac_cv_erlang_lib_ver_crypto=`$as_echo "$ac_cv_erlang_lib_dir_crypto" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_crypto" >&5
$as_echo "$ac_cv_erlang_lib_ver_crypto" >&6; }
ERLANG_LIB_DIR_crypto=$ac_cv_erlang_lib_dir_crypto
ERLANG_LIB_VER_crypto=$ac_cv_erlang_lib_ver_crypto
if test "$ac_cv_erlang_lib_dir_crypto" = "not found"; then :
as_fn_error $? "Erlang application 'crypto' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'public_key' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'public_key' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_public_key+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("public_key") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_public_key=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_public_key="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_public_key" >&5
$as_echo "$ac_cv_erlang_lib_dir_public_key" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'public_key' library version" >&5
$as_echo_n "checking for Erlang/OTP 'public_key' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_public_key+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_public_key" = "not found"; then :
ac_cv_erlang_lib_ver_public_key="not found"
else
ac_cv_erlang_lib_ver_public_key=`$as_echo "$ac_cv_erlang_lib_dir_public_key" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_public_key" >&5
$as_echo "$ac_cv_erlang_lib_ver_public_key" >&6; }
ERLANG_LIB_DIR_public_key=$ac_cv_erlang_lib_dir_public_key
ERLANG_LIB_VER_public_key=$ac_cv_erlang_lib_ver_public_key
if test "$ac_cv_erlang_lib_dir_public_key" = "not found"; then :
as_fn_error $? "Erlang application 'public_key' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'ssl' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'ssl' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_ssl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("ssl") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_ssl=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_ssl="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_ssl" >&5
$as_echo "$ac_cv_erlang_lib_dir_ssl" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'ssl' library version" >&5
$as_echo_n "checking for Erlang/OTP 'ssl' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_ssl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_ssl" = "not found"; then :
ac_cv_erlang_lib_ver_ssl="not found"
else
ac_cv_erlang_lib_ver_ssl=`$as_echo "$ac_cv_erlang_lib_dir_ssl" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_ssl" >&5
$as_echo "$ac_cv_erlang_lib_ver_ssl" >&6; }
ERLANG_LIB_DIR_ssl=$ac_cv_erlang_lib_dir_ssl
ERLANG_LIB_VER_ssl=$ac_cv_erlang_lib_ver_ssl
if test "$ac_cv_erlang_lib_dir_ssl" = "not found"; then :
as_fn_error $? "Erlang application 'ssl' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'mnesia' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'mnesia' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_mnesia+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("mnesia") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_mnesia=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_mnesia="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_mnesia" >&5
$as_echo "$ac_cv_erlang_lib_dir_mnesia" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'mnesia' library version" >&5
$as_echo_n "checking for Erlang/OTP 'mnesia' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_mnesia+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_mnesia" = "not found"; then :
ac_cv_erlang_lib_ver_mnesia="not found"
else
ac_cv_erlang_lib_ver_mnesia=`$as_echo "$ac_cv_erlang_lib_dir_mnesia" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_mnesia" >&5
$as_echo "$ac_cv_erlang_lib_ver_mnesia" >&6; }
ERLANG_LIB_DIR_mnesia=$ac_cv_erlang_lib_dir_mnesia
ERLANG_LIB_VER_mnesia=$ac_cv_erlang_lib_ver_mnesia
if test "$ac_cv_erlang_lib_dir_mnesia" = "not found"; then :
as_fn_error $? "Erlang application 'mnesia' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'inets' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'inets' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_inets+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("inets") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_inets=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_inets="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_inets" >&5
$as_echo "$ac_cv_erlang_lib_dir_inets" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'inets' library version" >&5
$as_echo_n "checking for Erlang/OTP 'inets' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_inets+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_inets" = "not found"; then :
ac_cv_erlang_lib_ver_inets="not found"
else
ac_cv_erlang_lib_ver_inets=`$as_echo "$ac_cv_erlang_lib_dir_inets" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_inets" >&5
$as_echo "$ac_cv_erlang_lib_ver_inets" >&6; }
ERLANG_LIB_DIR_inets=$ac_cv_erlang_lib_dir_inets
ERLANG_LIB_VER_inets=$ac_cv_erlang_lib_ver_inets
if test "$ac_cv_erlang_lib_dir_inets" = "not found"; then :
as_fn_error $? "Erlang application 'inets' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'compiler' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'compiler' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_compiler+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("compiler") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_compiler=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_compiler="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_compiler" >&5
$as_echo "$ac_cv_erlang_lib_dir_compiler" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'compiler' library version" >&5
$as_echo_n "checking for Erlang/OTP 'compiler' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_compiler+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_compiler" = "not found"; then :
ac_cv_erlang_lib_ver_compiler="not found"
else
ac_cv_erlang_lib_ver_compiler=`$as_echo "$ac_cv_erlang_lib_dir_compiler" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_compiler" >&5
$as_echo "$ac_cv_erlang_lib_ver_compiler" >&6; }
ERLANG_LIB_DIR_compiler=$ac_cv_erlang_lib_dir_compiler
ERLANG_LIB_VER_compiler=$ac_cv_erlang_lib_ver_compiler
if test "$ac_cv_erlang_lib_dir_compiler" = "not found"; then :
as_fn_error $? "Erlang application 'compiler' was not found" "$LINENO" 5
fi
if test "x$odbc" = "xtrue"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'odbc' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'odbc' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_odbc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("odbc") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_odbc=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_odbc="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_odbc" >&5
$as_echo "$ac_cv_erlang_lib_dir_odbc" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'odbc' library version" >&5
$as_echo_n "checking for Erlang/OTP 'odbc' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_odbc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_odbc" = "not found"; then :
ac_cv_erlang_lib_ver_odbc="not found"
else
ac_cv_erlang_lib_ver_odbc=`$as_echo "$ac_cv_erlang_lib_dir_odbc" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_odbc" >&5
$as_echo "$ac_cv_erlang_lib_ver_odbc" >&6; }
ERLANG_LIB_DIR_odbc=$ac_cv_erlang_lib_dir_odbc
ERLANG_LIB_VER_odbc=$ac_cv_erlang_lib_ver_odbc
if test "$ac_cv_erlang_lib_dir_odbc" = "not found"; then :
as_fn_error $? "Erlang application 'odbc' was not found" "$LINENO" 5
fi
fi
if test "x$tools" = "xtrue"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'tools' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'tools' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_tools+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("tools") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_tools=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_tools="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_tools" >&5
$as_echo "$ac_cv_erlang_lib_dir_tools" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'tools' library version" >&5
$as_echo_n "checking for Erlang/OTP 'tools' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_tools+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_tools" = "not found"; then :
ac_cv_erlang_lib_ver_tools="not found"
else
ac_cv_erlang_lib_ver_tools=`$as_echo "$ac_cv_erlang_lib_dir_tools" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_tools" >&5
$as_echo "$ac_cv_erlang_lib_ver_tools" >&6; }
ERLANG_LIB_DIR_tools=$ac_cv_erlang_lib_dir_tools
ERLANG_LIB_VER_tools=$ac_cv_erlang_lib_ver_tools
if test "$ac_cv_erlang_lib_dir_tools" = "not found"; then :
as_fn_error $? "Erlang application 'tools' was not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'runtime_tools' library subdirectory" >&5
$as_echo_n "checking for Erlang/OTP 'runtime_tools' library subdirectory... " >&6; }
if test "${ac_cv_erlang_lib_dir_runtime_tools+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=erl
ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5 ; }
else
cat > conftest.$ac_ext <<_ACEOF
-module(conftest).
-export([start/0]).
start() ->
ReturnValue = case code:lib_dir("runtime_tools") of
{error, bad_name} ->
file:write_file("conftest.out", "not found\n"),
1;
LibDir ->
file:write_file("conftest.out", LibDir),
0
end,
halt(ReturnValue)
.
_ACEOF
if ac_fn_erl_try_run "$LINENO"; then :
ac_cv_erlang_lib_dir_runtime_tools=`cat conftest.out`
rm -f conftest.out
else
if test ! -f conftest.out; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "test Erlang program execution failed
See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_erlang_lib_dir_runtime_tools="not found"
rm -f conftest.out
fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_dir_runtime_tools" >&5
$as_echo "$ac_cv_erlang_lib_dir_runtime_tools" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'runtime_tools' library version" >&5
$as_echo_n "checking for Erlang/OTP 'runtime_tools' library version... " >&6; }
if test "${ac_cv_erlang_lib_ver_runtime_tools+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_erlang_lib_dir_runtime_tools" = "not found"; then :
ac_cv_erlang_lib_ver_runtime_tools="not found"
else
ac_cv_erlang_lib_ver_runtime_tools=`$as_echo "$ac_cv_erlang_lib_dir_runtime_tools" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_erlang_lib_ver_runtime_tools" >&5
$as_echo "$ac_cv_erlang_lib_ver_runtime_tools" >&6; }
ERLANG_LIB_DIR_runtime_tools=$ac_cv_erlang_lib_dir_runtime_tools
ERLANG_LIB_VER_runtime_tools=$ac_cv_erlang_lib_ver_runtime_tools
if test "$ac_cv_erlang_lib_dir_runtime_tools" = "not found"; then :
as_fn_error $? "Erlang application 'runtime_tools' was not found" "$LINENO" 5
fi
fi
@ -4404,7 +3589,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ejabberd $as_me community 14.05-120-gedfb5fc, which was
This file was extended by ejabberd $as_me community 14.05-128-g792b5a2, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -4457,7 +3642,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ejabberd config.status community 14.05-120-gedfb5fc
ejabberd config.status community 14.05-128-g792b5a2
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"

25
configure.ac
View File

@ -235,31 +235,6 @@ if test "$ENABLEUSER" != ""; then
AC_SUBST([INSTALLUSER], [$ENABLEUSER])
fi
AC_ERLANG_CHECK_LIB([sasl], [],
[AC_MSG_ERROR([Erlang application 'sasl' was not found])])
AC_ERLANG_CHECK_LIB([crypto], [],
[AC_MSG_ERROR([Erlang application 'crypto' was not found])])
AC_ERLANG_CHECK_LIB([public_key], [],
[AC_MSG_ERROR([Erlang application 'public_key' was not found])])
AC_ERLANG_CHECK_LIB([ssl], [],
[AC_MSG_ERROR([Erlang application 'ssl' was not found])])
AC_ERLANG_CHECK_LIB([mnesia], [],
[AC_MSG_ERROR([Erlang application 'mnesia' was not found])])
AC_ERLANG_CHECK_LIB([inets], [],
[AC_MSG_ERROR([Erlang application 'inets' was not found])])
AC_ERLANG_CHECK_LIB([compiler], [],
[AC_MSG_ERROR([Erlang application 'compiler' was not found])])
if test "x$odbc" = "xtrue"; then
AC_ERLANG_CHECK_LIB([odbc], [],
[AC_MSG_ERROR([Erlang application 'odbc' was not found])])
fi
if test "x$tools" = "xtrue"; then
AC_ERLANG_CHECK_LIB([tools], [],
[AC_MSG_ERROR([Erlang application 'tools' was not found])])
AC_ERLANG_CHECK_LIB([runtime_tools], [],
[AC_MSG_ERROR([Erlang application 'runtime_tools' was not found])])
fi
AC_SUBST(hipe)
AC_SUBST(roster_gateway_workaround)
AC_SUBST(transient_supervisors)