mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-26 17:38:45 +01:00
apply flash hack patch
This commit is contained in:
parent
76d4ba66b2
commit
6c7316cbdd
@ -386,6 +386,9 @@ Some options that you may be interested in modifying:
|
|||||||
\titem{--enable-nif}
|
\titem{--enable-nif}
|
||||||
Replaces some critical Erlang functions with equivalents written in C to improve performance.
|
Replaces some critical Erlang functions with equivalents written in C to improve performance.
|
||||||
This feature requires Erlang/OTP R13B04 or higher.
|
This feature requires Erlang/OTP R13B04 or higher.
|
||||||
|
|
||||||
|
\titem{--enable-flash-hack}
|
||||||
|
Enable support for non-standard XML socket clients of Adobe Flash 8 and lower.
|
||||||
\end{description}
|
\end{description}
|
||||||
|
|
||||||
\makesubsection{install}{Install}
|
\makesubsection{install}{Install}
|
||||||
@ -2000,9 +2003,19 @@ enabled. This can be done, by using next commands:
|
|||||||
\makesubsubsection{configuremssql}{Database Connection}
|
\makesubsubsection{configuremssql}{Database Connection}
|
||||||
\ind{Microsoft SQL Server!Database Connection}
|
\ind{Microsoft SQL Server!Database Connection}
|
||||||
|
|
||||||
The configuration of Database Connection for a Microsoft SQL Server
|
By default \ejabberd{} opens 10 connections to the database for each virtual host.
|
||||||
is the same as the configuration for
|
Use this option to modify the value:
|
||||||
ODBC compatible servers (see section~\ref{configureodbc}).
|
\begin{verbatim}
|
||||||
|
{odbc_pool_size, 10}.
|
||||||
|
\end{verbatim}
|
||||||
|
|
||||||
|
You can configure an interval to make a dummy SQL request
|
||||||
|
to keep alive the connections to the database.
|
||||||
|
The default value is 'undefined', so no keepalive requests are made.
|
||||||
|
Specify in seconds: for example 28800 means 8 hours.
|
||||||
|
\begin{verbatim}
|
||||||
|
{odbc_keepalive_interval, undefined}.
|
||||||
|
\end{verbatim}
|
||||||
|
|
||||||
|
|
||||||
\makesubsubsection{mssqlauth}{Authentication}
|
\makesubsubsection{mssqlauth}{Authentication}
|
||||||
@ -2010,8 +2023,7 @@ ODBC compatible servers (see section~\ref{configureodbc}).
|
|||||||
|
|
||||||
%TODO: not sure if this section is right!!!!!!
|
%TODO: not sure if this section is right!!!!!!
|
||||||
|
|
||||||
The configuration of Authentication for a Microsoft SQL Server
|
The configuration of Microsoft SQL Server is the same as the configuration of
|
||||||
is the same as the configuration for
|
|
||||||
ODBC compatible servers (see section~\ref{odbcauth}).
|
ODBC compatible servers (see section~\ref{odbcauth}).
|
||||||
|
|
||||||
\makesubsubsection{mssqlstorage}{Storage}
|
\makesubsubsection{mssqlstorage}{Storage}
|
||||||
@ -2218,9 +2230,6 @@ and LDAP server supports
|
|||||||
|
|
||||||
\makesubsubsection{ldapconnection}{Connection}
|
\makesubsubsection{ldapconnection}{Connection}
|
||||||
|
|
||||||
Two connections are established to the LDAP server per vhost,
|
|
||||||
one for authentication and other for regular calls.
|
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
\begin{description}
|
\begin{description}
|
||||||
\titem{\{ldap\_servers, [Servers, ...]\}} \ind{options!ldap\_server}List of IP addresses or DNS names of your
|
\titem{\{ldap\_servers, [Servers, ...]\}} \ind{options!ldap\_server}List of IP addresses or DNS names of your
|
||||||
|
@ -74,6 +74,11 @@ ifeq (@pam@, pam)
|
|||||||
INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
|
INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq (@flash_hack@, true)
|
||||||
|
ERLC_FLAGS+=-DENABLE_FLASH_HACK
|
||||||
|
CPPFLAGS+=-DENABLE_FLASH_HACK
|
||||||
|
endif
|
||||||
|
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
|
|
||||||
@ -168,7 +173,7 @@ mostlyclean-recursive maintainer-clean-recursive:
|
|||||||
@ERLC@ -W $(EFLAGS) $*.erl
|
@ERLC@ -W $(EFLAGS) $*.erl
|
||||||
|
|
||||||
$(ERLSHLIBS): %.so: %.c
|
$(ERLSHLIBS): %.so: %.c
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
|
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) \
|
||||||
$(subst ../,,$(subst .so,.c,$@)) \
|
$(subst ../,,$(subst .so,.c,$@)) \
|
||||||
$(EXPAT_LIBS) \
|
$(EXPAT_LIBS) \
|
||||||
$(EXPAT_CFLAGS) \
|
$(EXPAT_CFLAGS) \
|
||||||
|
353
src/configure
vendored
353
src/configure
vendored
@ -1,13 +1,13 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.65 for ejabberd 2.1.x.
|
# Generated by GNU Autoconf 2.67 for ejabberd 2.1.x.
|
||||||
#
|
#
|
||||||
# Report bugs to <ejabberd@process-one.net>.
|
# Report bugs to <ejabberd@process-one.net>.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||||
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
||||||
# Inc.
|
# Foundation, Inc.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# This configure script is free software; the Free Software Foundation
|
# This configure script is free software; the Free Software Foundation
|
||||||
@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
|
|||||||
test -d "$as_dir" && break
|
test -d "$as_dir" && break
|
||||||
done
|
done
|
||||||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||||||
} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||||||
|
|
||||||
|
|
||||||
} # as_fn_mkdir_p
|
} # as_fn_mkdir_p
|
||||||
@ -359,19 +359,19 @@ else
|
|||||||
fi # as_fn_arith
|
fi # as_fn_arith
|
||||||
|
|
||||||
|
|
||||||
# as_fn_error ERROR [LINENO LOG_FD]
|
# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||||||
# ---------------------------------
|
# ----------------------------------------
|
||||||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||||||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||||||
# script with status $?, using 1 if that was 0.
|
# script with STATUS, using 1 if that was 0.
|
||||||
as_fn_error ()
|
as_fn_error ()
|
||||||
{
|
{
|
||||||
as_status=$?; test $as_status -eq 0 && as_status=1
|
as_status=$1; test $as_status -eq 0 && as_status=1
|
||||||
if test "$3"; then
|
if test "$4"; then
|
||||||
as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||||||
fi
|
fi
|
||||||
$as_echo "$as_me: error: $1" >&2
|
$as_echo "$as_me: error: $2" >&2
|
||||||
as_fn_exit $as_status
|
as_fn_exit $as_status
|
||||||
} # as_fn_error
|
} # as_fn_error
|
||||||
|
|
||||||
@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
|
|||||||
exec 6>&1
|
exec 6>&1
|
||||||
|
|
||||||
# Name of the host.
|
# Name of the host.
|
||||||
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
|
||||||
# so uname gets run too.
|
# so uname gets run too.
|
||||||
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
||||||
|
|
||||||
@ -616,6 +616,7 @@ nif
|
|||||||
full_xml
|
full_xml
|
||||||
transient_supervisors
|
transient_supervisors
|
||||||
db_type
|
db_type
|
||||||
|
flash_hack
|
||||||
roster_gateway_workaround
|
roster_gateway_workaround
|
||||||
hipe
|
hipe
|
||||||
PAM_LIBS
|
PAM_LIBS
|
||||||
@ -720,6 +721,7 @@ enable_pam
|
|||||||
with_pam
|
with_pam
|
||||||
enable_hipe
|
enable_hipe
|
||||||
enable_roster_gateway_workaround
|
enable_roster_gateway_workaround
|
||||||
|
enable_flash_hack
|
||||||
enable_mssql
|
enable_mssql
|
||||||
enable_transient_supervisors
|
enable_transient_supervisors
|
||||||
enable_full_xml
|
enable_full_xml
|
||||||
@ -800,7 +802,8 @@ do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
case $ac_option in
|
case $ac_option in
|
||||||
*=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
*=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||||||
|
*=) ac_optarg= ;;
|
||||||
*) ac_optarg=yes ;;
|
*) ac_optarg=yes ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -846,7 +849,7 @@ do
|
|||||||
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||||||
# Reject names that are not valid shell variable names.
|
# Reject names that are not valid shell variable names.
|
||||||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||||||
as_fn_error "invalid feature name: $ac_useropt"
|
as_fn_error $? "invalid feature name: $ac_useropt"
|
||||||
ac_useropt_orig=$ac_useropt
|
ac_useropt_orig=$ac_useropt
|
||||||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||||||
case $ac_user_opts in
|
case $ac_user_opts in
|
||||||
@ -872,7 +875,7 @@ do
|
|||||||
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||||||
# Reject names that are not valid shell variable names.
|
# Reject names that are not valid shell variable names.
|
||||||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||||||
as_fn_error "invalid feature name: $ac_useropt"
|
as_fn_error $? "invalid feature name: $ac_useropt"
|
||||||
ac_useropt_orig=$ac_useropt
|
ac_useropt_orig=$ac_useropt
|
||||||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||||||
case $ac_user_opts in
|
case $ac_user_opts in
|
||||||
@ -1076,7 +1079,7 @@ do
|
|||||||
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||||||
# Reject names that are not valid shell variable names.
|
# Reject names that are not valid shell variable names.
|
||||||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||||||
as_fn_error "invalid package name: $ac_useropt"
|
as_fn_error $? "invalid package name: $ac_useropt"
|
||||||
ac_useropt_orig=$ac_useropt
|
ac_useropt_orig=$ac_useropt
|
||||||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||||||
case $ac_user_opts in
|
case $ac_user_opts in
|
||||||
@ -1092,7 +1095,7 @@ do
|
|||||||
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||||||
# Reject names that are not valid shell variable names.
|
# Reject names that are not valid shell variable names.
|
||||||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||||||
as_fn_error "invalid package name: $ac_useropt"
|
as_fn_error $? "invalid package name: $ac_useropt"
|
||||||
ac_useropt_orig=$ac_useropt
|
ac_useropt_orig=$ac_useropt
|
||||||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||||||
case $ac_user_opts in
|
case $ac_user_opts in
|
||||||
@ -1122,8 +1125,8 @@ do
|
|||||||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||||||
x_libraries=$ac_optarg ;;
|
x_libraries=$ac_optarg ;;
|
||||||
|
|
||||||
-*) as_fn_error "unrecognized option: \`$ac_option'
|
-*) as_fn_error $? "unrecognized option: \`$ac_option'
|
||||||
Try \`$0 --help' for more information."
|
Try \`$0 --help' for more information"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*=*)
|
*=*)
|
||||||
@ -1131,7 +1134,7 @@ Try \`$0 --help' for more information."
|
|||||||
# Reject names that are not valid shell variable names.
|
# Reject names that are not valid shell variable names.
|
||||||
case $ac_envvar in #(
|
case $ac_envvar in #(
|
||||||
'' | [0-9]* | *[!_$as_cr_alnum]* )
|
'' | [0-9]* | *[!_$as_cr_alnum]* )
|
||||||
as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
|
||||||
esac
|
esac
|
||||||
eval $ac_envvar=\$ac_optarg
|
eval $ac_envvar=\$ac_optarg
|
||||||
export $ac_envvar ;;
|
export $ac_envvar ;;
|
||||||
@ -1149,13 +1152,13 @@ done
|
|||||||
|
|
||||||
if test -n "$ac_prev"; then
|
if test -n "$ac_prev"; then
|
||||||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||||||
as_fn_error "missing argument to $ac_option"
|
as_fn_error $? "missing argument to $ac_option"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$ac_unrecognized_opts"; then
|
if test -n "$ac_unrecognized_opts"; then
|
||||||
case $enable_option_checking in
|
case $enable_option_checking in
|
||||||
no) ;;
|
no) ;;
|
||||||
fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
|
||||||
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -1178,7 +1181,7 @@ do
|
|||||||
[\\/$]* | ?:[\\/]* ) continue;;
|
[\\/$]* | ?:[\\/]* ) continue;;
|
||||||
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
||||||
esac
|
esac
|
||||||
as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
|
||||||
done
|
done
|
||||||
|
|
||||||
# There might be people who depend on the old broken behavior: `$host'
|
# There might be people who depend on the old broken behavior: `$host'
|
||||||
@ -1192,8 +1195,8 @@ target=$target_alias
|
|||||||
if test "x$host_alias" != x; then
|
if test "x$host_alias" != x; then
|
||||||
if test "x$build_alias" = x; then
|
if test "x$build_alias" = x; then
|
||||||
cross_compiling=maybe
|
cross_compiling=maybe
|
||||||
$as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
$as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
||||||
If a cross compiler is detected then cross compile mode will be used." >&2
|
If a cross compiler is detected then cross compile mode will be used" >&2
|
||||||
elif test "x$build_alias" != "x$host_alias"; then
|
elif test "x$build_alias" != "x$host_alias"; then
|
||||||
cross_compiling=yes
|
cross_compiling=yes
|
||||||
fi
|
fi
|
||||||
@ -1208,9 +1211,9 @@ test "$silent" = yes && exec 6>/dev/null
|
|||||||
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
||||||
ac_ls_di=`ls -di .` &&
|
ac_ls_di=`ls -di .` &&
|
||||||
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
||||||
as_fn_error "working directory cannot be determined"
|
as_fn_error $? "working directory cannot be determined"
|
||||||
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
||||||
as_fn_error "pwd does not report name of working directory"
|
as_fn_error $? "pwd does not report name of working directory"
|
||||||
|
|
||||||
|
|
||||||
# Find the source files, if location was not specified.
|
# Find the source files, if location was not specified.
|
||||||
@ -1249,11 +1252,11 @@ else
|
|||||||
fi
|
fi
|
||||||
if test ! -r "$srcdir/$ac_unique_file"; then
|
if test ! -r "$srcdir/$ac_unique_file"; then
|
||||||
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
||||||
as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
|
||||||
fi
|
fi
|
||||||
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
||||||
ac_abs_confdir=`(
|
ac_abs_confdir=`(
|
||||||
cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
|
||||||
pwd)`
|
pwd)`
|
||||||
# When building in place, set srcdir=.
|
# When building in place, set srcdir=.
|
||||||
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
||||||
@ -1293,7 +1296,7 @@ Configuration:
|
|||||||
--help=short display options specific to this package
|
--help=short display options specific to this package
|
||||||
--help=recursive display the short help of all the included packages
|
--help=recursive display the short help of all the included packages
|
||||||
-V, --version display version information and exit
|
-V, --version display version information and exit
|
||||||
-q, --quiet, --silent do not print \`checking...' messages
|
-q, --quiet, --silent do not print \`checking ...' messages
|
||||||
--cache-file=FILE cache test results in FILE [disabled]
|
--cache-file=FILE cache test results in FILE [disabled]
|
||||||
-C, --config-cache alias for \`--cache-file=config.cache'
|
-C, --config-cache alias for \`--cache-file=config.cache'
|
||||||
-n, --no-create do not create output files
|
-n, --no-create do not create output files
|
||||||
@ -1368,6 +1371,7 @@ Optional Features:
|
|||||||
--enable-roster-gateway-workaround
|
--enable-roster-gateway-workaround
|
||||||
turn on workaround for processing gateway
|
turn on workaround for processing gateway
|
||||||
subscriptions (default: no)
|
subscriptions (default: no)
|
||||||
|
--enable-flash-hack support Adobe Flash client XML (default: no)
|
||||||
--enable-mssql use Microsoft SQL Server database (default: no,
|
--enable-mssql use Microsoft SQL Server database (default: no,
|
||||||
requires --enable-odbc)
|
requires --enable-odbc)
|
||||||
--enable-transient_supervisors
|
--enable-transient_supervisors
|
||||||
@ -1471,9 +1475,9 @@ test -n "$ac_init_help" && exit $ac_status
|
|||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
ejabberd configure 2.1.x
|
ejabberd configure 2.1.x
|
||||||
generated by GNU Autoconf 2.65
|
generated by GNU Autoconf 2.67
|
||||||
|
|
||||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||||
This configure script is free software; the Free Software Foundation
|
This configure script is free software; the Free Software Foundation
|
||||||
gives unlimited permission to copy, distribute and modify it.
|
gives unlimited permission to copy, distribute and modify it.
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@ -1589,7 +1593,7 @@ $as_echo "$ac_try_echo"; } >&5
|
|||||||
mv -f conftest.er1 conftest.err
|
mv -f conftest.er1 conftest.err
|
||||||
fi
|
fi
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
test $ac_status = 0; } >/dev/null && {
|
test $ac_status = 0; } > conftest.i && {
|
||||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
test ! -s conftest.err
|
||||||
}; then :
|
}; then :
|
||||||
@ -1613,10 +1617,10 @@ fi
|
|||||||
ac_fn_c_check_header_mongrel ()
|
ac_fn_c_check_header_mongrel ()
|
||||||
{
|
{
|
||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
if eval "test \"\${$3+set}\"" = set; then :
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||||||
$as_echo_n "checking for $2... " >&6; }
|
$as_echo_n "checking for $2... " >&6; }
|
||||||
if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
if eval "test \"\${$3+set}\"" = set; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
fi
|
fi
|
||||||
eval ac_res=\$$3
|
eval ac_res=\$$3
|
||||||
@ -1652,7 +1656,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
|
|||||||
else
|
else
|
||||||
ac_header_preproc=no
|
ac_header_preproc=no
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
||||||
$as_echo "$ac_header_preproc" >&6; }
|
$as_echo "$ac_header_preproc" >&6; }
|
||||||
|
|
||||||
@ -1675,17 +1679,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
|||||||
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
||||||
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
||||||
( cat <<\_ASBOX
|
( $as_echo "## --------------------------------------- ##
|
||||||
## --------------------------------------- ##
|
|
||||||
## Report this to ejabberd@process-one.net ##
|
## Report this to ejabberd@process-one.net ##
|
||||||
## --------------------------------------- ##
|
## --------------------------------------- ##"
|
||||||
_ASBOX
|
|
||||||
) | sed "s/^/$as_me: WARNING: /" >&2
|
) | sed "s/^/$as_me: WARNING: /" >&2
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||||||
$as_echo_n "checking for $2... " >&6; }
|
$as_echo_n "checking for $2... " >&6; }
|
||||||
if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
if eval "test \"\${$3+set}\"" = set; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
eval "$3=\$ac_header_compiler"
|
eval "$3=\$ac_header_compiler"
|
||||||
@ -1749,7 +1751,7 @@ ac_fn_c_check_header_compile ()
|
|||||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||||||
$as_echo_n "checking for $2... " >&6; }
|
$as_echo_n "checking for $2... " >&6; }
|
||||||
if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
if eval "test \"\${$3+set}\"" = set; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
@ -1817,7 +1819,7 @@ This file contains any messages produced by compilers while
|
|||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by ejabberd $as_me 2.1.x, which was
|
It was created by ejabberd $as_me 2.1.x, which was
|
||||||
generated by GNU Autoconf 2.65. Invocation command line was
|
generated by GNU Autoconf 2.67. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
|
|
||||||
@ -1927,11 +1929,9 @@ trap 'exit_status=$?
|
|||||||
{
|
{
|
||||||
echo
|
echo
|
||||||
|
|
||||||
cat <<\_ASBOX
|
$as_echo "## ---------------- ##
|
||||||
## ---------------- ##
|
|
||||||
## Cache variables. ##
|
## Cache variables. ##
|
||||||
## ---------------- ##
|
## ---------------- ##"
|
||||||
_ASBOX
|
|
||||||
echo
|
echo
|
||||||
# The following way of writing the cache mishandles newlines in values,
|
# The following way of writing the cache mishandles newlines in values,
|
||||||
(
|
(
|
||||||
@ -1965,11 +1965,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
|||||||
)
|
)
|
||||||
echo
|
echo
|
||||||
|
|
||||||
cat <<\_ASBOX
|
$as_echo "## ----------------- ##
|
||||||
## ----------------- ##
|
|
||||||
## Output variables. ##
|
## Output variables. ##
|
||||||
## ----------------- ##
|
## ----------------- ##"
|
||||||
_ASBOX
|
|
||||||
echo
|
echo
|
||||||
for ac_var in $ac_subst_vars
|
for ac_var in $ac_subst_vars
|
||||||
do
|
do
|
||||||
@ -1982,11 +1980,9 @@ _ASBOX
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
if test -n "$ac_subst_files"; then
|
if test -n "$ac_subst_files"; then
|
||||||
cat <<\_ASBOX
|
$as_echo "## ------------------- ##
|
||||||
## ------------------- ##
|
|
||||||
## File substitutions. ##
|
## File substitutions. ##
|
||||||
## ------------------- ##
|
## ------------------- ##"
|
||||||
_ASBOX
|
|
||||||
echo
|
echo
|
||||||
for ac_var in $ac_subst_files
|
for ac_var in $ac_subst_files
|
||||||
do
|
do
|
||||||
@ -2000,11 +1996,9 @@ _ASBOX
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test -s confdefs.h; then
|
if test -s confdefs.h; then
|
||||||
cat <<\_ASBOX
|
$as_echo "## ----------- ##
|
||||||
## ----------- ##
|
|
||||||
## confdefs.h. ##
|
## confdefs.h. ##
|
||||||
## ----------- ##
|
## ----------- ##"
|
||||||
_ASBOX
|
|
||||||
echo
|
echo
|
||||||
cat confdefs.h
|
cat confdefs.h
|
||||||
echo
|
echo
|
||||||
@ -2059,7 +2053,12 @@ _ACEOF
|
|||||||
ac_site_file1=NONE
|
ac_site_file1=NONE
|
||||||
ac_site_file2=NONE
|
ac_site_file2=NONE
|
||||||
if test -n "$CONFIG_SITE"; then
|
if test -n "$CONFIG_SITE"; then
|
||||||
ac_site_file1=$CONFIG_SITE
|
# We do not want a PATH search for config.site.
|
||||||
|
case $CONFIG_SITE in #((
|
||||||
|
-*) ac_site_file1=./$CONFIG_SITE;;
|
||||||
|
*/*) ac_site_file1=$CONFIG_SITE;;
|
||||||
|
*) ac_site_file1=./$CONFIG_SITE;;
|
||||||
|
esac
|
||||||
elif test "x$prefix" != xNONE; then
|
elif test "x$prefix" != xNONE; then
|
||||||
ac_site_file1=$prefix/share/config.site
|
ac_site_file1=$prefix/share/config.site
|
||||||
ac_site_file2=$prefix/etc/config.site
|
ac_site_file2=$prefix/etc/config.site
|
||||||
@ -2074,7 +2073,11 @@ do
|
|||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
||||||
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
||||||
sed 's/^/| /' "$ac_site_file" >&5
|
sed 's/^/| /' "$ac_site_file" >&5
|
||||||
. "$ac_site_file"
|
. "$ac_site_file" \
|
||||||
|
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
as_fn_error $? "failed to load site script $ac_site_file
|
||||||
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -2150,7 +2153,7 @@ if $ac_cache_corrupted; then
|
|||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
||||||
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||||||
as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
## -------------------- ##
|
## -------------------- ##
|
||||||
## Main body of script. ##
|
## Main body of script. ##
|
||||||
@ -2465,8 +2468,8 @@ fi
|
|||||||
|
|
||||||
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "no acceptable C compiler found in \$PATH
|
as_fn_error $? "no acceptable C compiler found in \$PATH
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
|
|
||||||
# Provide some information about the compiler.
|
# Provide some information about the compiler.
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||||||
@ -2580,9 +2583,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|||||||
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
{ as_fn_set_status 77
|
as_fn_error 77 "C compiler cannot create executables
|
||||||
as_fn_error "C compiler cannot create executables
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
See \`config.log' for more details." "$LINENO" 5; }; }
|
|
||||||
else
|
else
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
@ -2624,8 +2626,8 @@ done
|
|||||||
else
|
else
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "cannot compute suffix of executables: cannot compile and link
|
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
fi
|
fi
|
||||||
rm -f conftest conftest$ac_cv_exeext
|
rm -f conftest conftest$ac_cv_exeext
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
||||||
@ -2682,9 +2684,9 @@ $as_echo "$ac_try_echo"; } >&5
|
|||||||
else
|
else
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "cannot run C compiled programs.
|
as_fn_error $? "cannot run C compiled programs.
|
||||||
If you meant to cross compile, use \`--host'.
|
If you meant to cross compile, use \`--host'.
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -2735,8 +2737,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|||||||
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "cannot compute suffix of object files: cannot compile
|
as_fn_error $? "cannot compute suffix of object files: cannot compile
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
fi
|
fi
|
||||||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||||||
fi
|
fi
|
||||||
@ -2960,7 +2962,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
||||||
set x ${MAKE-make}
|
set x ${MAKE-make}
|
||||||
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
||||||
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
cat >conftest.make <<\_ACEOF
|
cat >conftest.make <<\_ACEOF
|
||||||
@ -2968,7 +2970,7 @@ SHELL = /bin/sh
|
|||||||
all:
|
all:
|
||||||
@echo '@@@%%%=$(MAKE)=@@@%%%'
|
@echo '@@@%%%=$(MAKE)=@@@%%%'
|
||||||
_ACEOF
|
_ACEOF
|
||||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
|
||||||
case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
||||||
*@@@%%%=?*=@@@%%%*)
|
*@@@%%%=?*=@@@%%%*)
|
||||||
eval ac_cv_prog_make_${ac_make}_set=yes;;
|
eval ac_cv_prog_make_${ac_make}_set=yes;;
|
||||||
@ -3202,7 +3204,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
if test "z$ERLC" = "z" || test "z$ERL" = "z"; then
|
if test "z$ERLC" = "z" || test "z$ERL" = "z"; then
|
||||||
as_fn_error "erlang not found" "$LINENO" 5
|
as_fn_error $? "erlang not found" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -3260,15 +3262,15 @@ libpath(App) ->
|
|||||||
_EOF
|
_EOF
|
||||||
|
|
||||||
if ! $ERLC conftest.erl; then
|
if ! $ERLC conftest.erl; then
|
||||||
as_fn_error "could not compile sample program" "$LINENO" 5
|
as_fn_error $? "could not compile sample program" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! $ERL -s conftest -noshell; then
|
if ! $ERL -s conftest -noshell; then
|
||||||
as_fn_error "could not run sample program" "$LINENO" 5
|
as_fn_error $? "could not run sample program" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! test -f conftest.out; then
|
if ! test -f conftest.out; then
|
||||||
as_fn_error "erlang program was not properly executed, (conftest.out was not produced)" "$LINENO" 5
|
as_fn_error $? "erlang program was not properly executed, (conftest.out was not produced)" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# First line
|
# First line
|
||||||
@ -3497,7 +3499,7 @@ else
|
|||||||
# Broken: fails on valid input.
|
# Broken: fails on valid input.
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||||
|
|
||||||
# OK, works on sane cases. Now check whether nonexistent headers
|
# OK, works on sane cases. Now check whether nonexistent headers
|
||||||
# can be detected and how.
|
# can be detected and how.
|
||||||
@ -3513,11 +3515,11 @@ else
|
|||||||
ac_preproc_ok=:
|
ac_preproc_ok=:
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||||
|
|
||||||
done
|
done
|
||||||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.i conftest.err conftest.$ac_ext
|
||||||
if $ac_preproc_ok; then :
|
if $ac_preproc_ok; then :
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
@ -3556,7 +3558,7 @@ else
|
|||||||
# Broken: fails on valid input.
|
# Broken: fails on valid input.
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||||
|
|
||||||
# OK, works on sane cases. Now check whether nonexistent headers
|
# OK, works on sane cases. Now check whether nonexistent headers
|
||||||
# can be detected and how.
|
# can be detected and how.
|
||||||
@ -3572,18 +3574,18 @@ else
|
|||||||
ac_preproc_ok=:
|
ac_preproc_ok=:
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||||
|
|
||||||
done
|
done
|
||||||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||||||
rm -f conftest.err conftest.$ac_ext
|
rm -f conftest.i conftest.err conftest.$ac_ext
|
||||||
if $ac_preproc_ok; then :
|
if $ac_preproc_ok; then :
|
||||||
|
|
||||||
else
|
else
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
@ -3644,7 +3646,7 @@ esac
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
if test -z "$ac_cv_path_GREP"; then
|
if test -z "$ac_cv_path_GREP"; then
|
||||||
as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
ac_cv_path_GREP=$GREP
|
ac_cv_path_GREP=$GREP
|
||||||
@ -3710,7 +3712,7 @@ esac
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
if test -z "$ac_cv_path_EGREP"; then
|
if test -z "$ac_cv_path_EGREP"; then
|
||||||
as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
ac_cv_path_EGREP=$EGREP
|
ac_cv_path_EGREP=$EGREP
|
||||||
@ -3842,8 +3844,7 @@ do :
|
|||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
||||||
"
|
"
|
||||||
eval as_val=\$$as_ac_Header
|
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||||
if test "x$as_val" = x""yes; then :
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@ -3911,7 +3912,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test $expat_found = no; then
|
if test $expat_found = no; then
|
||||||
as_fn_error "Could not find development files of Expat library" "$LINENO" 5
|
as_fn_error $? "Could not find development files of Expat library" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
expat_save_CFLAGS="$CFLAGS"
|
expat_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $EXPAT_CFLAGS"
|
CFLAGS="$CFLAGS $EXPAT_CFLAGS"
|
||||||
@ -3932,7 +3933,7 @@ fi
|
|||||||
done
|
done
|
||||||
|
|
||||||
if test $expat_found = no; then
|
if test $expat_found = no; then
|
||||||
as_fn_error "Could not find expat.h" "$LINENO" 5
|
as_fn_error $? "Could not find expat.h" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
CFLAGS="$expat_save_CFLAGS"
|
CFLAGS="$expat_save_CFLAGS"
|
||||||
CPPFLAGS="$expat_save_CPPFLAGS"
|
CPPFLAGS="$expat_save_CPPFLAGS"
|
||||||
@ -4469,7 +4470,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test $zlib_found = no; then
|
if test $zlib_found = no; then
|
||||||
as_fn_error "Could not find development files of zlib library. Install them or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5
|
as_fn_error $? "Could not find development files of zlib library. Install them or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
zlib_save_CFLAGS="$CFLAGS"
|
zlib_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
|
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
|
||||||
@ -4490,7 +4491,7 @@ fi
|
|||||||
done
|
done
|
||||||
|
|
||||||
if test $zlib_found = no; then
|
if test $zlib_found = no; then
|
||||||
as_fn_error "Could not find zlib.h. Install it or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5
|
as_fn_error $? "Could not find zlib.h. Install it or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
CFLAGS="$zlib_save_CFLAGS"
|
CFLAGS="$zlib_save_CFLAGS"
|
||||||
CPPFLAGS="$zlib_save_CPPFLAGS"
|
CPPFLAGS="$zlib_save_CPPFLAGS"
|
||||||
@ -4581,7 +4582,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test $pam_found = no; then
|
if test $pam_found = no; then
|
||||||
as_fn_error "Could not find development files of PAM library. Install them or disable \`pam' with: --disable-pam" "$LINENO" 5
|
as_fn_error $? "Could not find development files of PAM library. Install them or disable \`pam' with: --disable-pam" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
pam_save_CFLAGS="$CFLAGS"
|
pam_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $PAM_CFLAGS"
|
CFLAGS="$CFLAGS $PAM_CFLAGS"
|
||||||
@ -4602,7 +4603,7 @@ fi
|
|||||||
done
|
done
|
||||||
|
|
||||||
if test $pam_found = no; then
|
if test $pam_found = no; then
|
||||||
as_fn_error "Could not find security/pam_appl.h. Install it or disable \`pam' with: --disable-pam" "$LINENO" 5
|
as_fn_error $? "Could not find security/pam_appl.h. Install it or disable \`pam' with: --disable-pam" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
CFLAGS="$pam_save_CFLAGS"
|
CFLAGS="$pam_save_CFLAGS"
|
||||||
CPPFLAGS="$pam_save_CPPFLAGS"
|
CPPFLAGS="$pam_save_CPPFLAGS"
|
||||||
@ -4617,7 +4618,7 @@ if test "${enable_hipe+set}" = set; then :
|
|||||||
enableval=$enable_hipe; case "${enableval}" in
|
enableval=$enable_hipe; case "${enableval}" in
|
||||||
yes) hipe=true ;;
|
yes) hipe=true ;;
|
||||||
no) hipe=false ;;
|
no) hipe=false ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-hipe" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-hipe" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
hipe=false
|
hipe=false
|
||||||
@ -4630,7 +4631,7 @@ if test "${enable_roster_gateway_workaround+set}" = set; then :
|
|||||||
enableval=$enable_roster_gateway_workaround; case "${enableval}" in
|
enableval=$enable_roster_gateway_workaround; case "${enableval}" in
|
||||||
yes) roster_gateway_workaround=true ;;
|
yes) roster_gateway_workaround=true ;;
|
||||||
no) roster_gateway_workaround=false ;;
|
no) roster_gateway_workaround=false ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-roster-gateway-workaround" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-roster-gateway-workaround" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
roster_gateway_workaround=false
|
roster_gateway_workaround=false
|
||||||
@ -4638,12 +4639,25 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --enable-flash_hack was given.
|
||||||
|
if test "${enable_flash_hack+set}" = set; then :
|
||||||
|
enableval=$enable_flash_hack; case "${enableval}" in
|
||||||
|
yes) flash_hack=true ;;
|
||||||
|
no) flash_hack=false ;;
|
||||||
|
*) as_fn_error $? "bad value ${enableval} for --enable-flash-hack" "$LINENO" 5 ;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
flash_hack=false
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-mssql was given.
|
# Check whether --enable-mssql was given.
|
||||||
if test "${enable_mssql+set}" = set; then :
|
if test "${enable_mssql+set}" = set; then :
|
||||||
enableval=$enable_mssql; case "${enableval}" in
|
enableval=$enable_mssql; case "${enableval}" in
|
||||||
yes) db_type=mssql ;;
|
yes) db_type=mssql ;;
|
||||||
no) db_type=generic ;;
|
no) db_type=generic ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-mssql" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-mssql" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
db_type=generic
|
db_type=generic
|
||||||
@ -4656,7 +4670,7 @@ if test "${enable_transient_supervisors+set}" = set; then :
|
|||||||
enableval=$enable_transient_supervisors; case "${enableval}" in
|
enableval=$enable_transient_supervisors; case "${enableval}" in
|
||||||
yes) transient_supervisors=true ;;
|
yes) transient_supervisors=true ;;
|
||||||
no) transient_supervisors=false ;;
|
no) transient_supervisors=false ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-transient_supervisors" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-transient_supervisors" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
transient_supervisors=true
|
transient_supervisors=true
|
||||||
@ -4669,7 +4683,7 @@ if test "${enable_full_xml+set}" = set; then :
|
|||||||
enableval=$enable_full_xml; case "${enableval}" in
|
enableval=$enable_full_xml; case "${enableval}" in
|
||||||
yes) full_xml=true ;;
|
yes) full_xml=true ;;
|
||||||
no) full_xml=false ;;
|
no) full_xml=false ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-full-xml" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-full-xml" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
full_xml=false
|
full_xml=false
|
||||||
@ -4682,7 +4696,7 @@ if test "${enable_nif+set}" = set; then :
|
|||||||
enableval=$enable_nif; case "${enableval}" in
|
enableval=$enable_nif; case "${enableval}" in
|
||||||
yes) nif=true ;;
|
yes) nif=true ;;
|
||||||
no) nif=false ;;
|
no) nif=false ;;
|
||||||
*) as_fn_error "bad value ${enableval} for --enable-nif" "$LINENO" 5 ;;
|
*) as_fn_error $? "bad value ${enableval} for --enable-nif" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
nif=false
|
nif=false
|
||||||
@ -4780,7 +4794,7 @@ done
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if test x${have_openssl} != xyes; then
|
if test x${have_openssl} != xyes; then
|
||||||
as_fn_error "Could not find development files of OpenSSL library. Install them or disable \`tls' with: --disable-tls" "$LINENO" 5
|
as_fn_error $? "Could not find development files of OpenSSL library. Install them or disable \`tls' with: --disable-tls" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -4835,16 +4849,22 @@ fi
|
|||||||
|
|
||||||
ac_aux_dir=
|
ac_aux_dir=
|
||||||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||||||
for ac_t in install-sh install.sh shtool; do
|
if test -f "$ac_dir/install-sh"; then
|
||||||
if test -f "$ac_dir/$ac_t"; then
|
|
||||||
ac_aux_dir=$ac_dir
|
ac_aux_dir=$ac_dir
|
||||||
ac_install_sh="$ac_aux_dir/$ac_t -c"
|
ac_install_sh="$ac_aux_dir/install-sh -c"
|
||||||
break 2
|
break
|
||||||
|
elif test -f "$ac_dir/install.sh"; then
|
||||||
|
ac_aux_dir=$ac_dir
|
||||||
|
ac_install_sh="$ac_aux_dir/install.sh -c"
|
||||||
|
break
|
||||||
|
elif test -f "$ac_dir/shtool"; then
|
||||||
|
ac_aux_dir=$ac_dir
|
||||||
|
ac_install_sh="$ac_aux_dir/shtool install -c"
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
done
|
done
|
||||||
if test -z "$ac_aux_dir"; then
|
if test -z "$ac_aux_dir"; then
|
||||||
as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# These three variables are undocumented and unsupported,
|
# These three variables are undocumented and unsupported,
|
||||||
@ -4858,7 +4878,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|||||||
|
|
||||||
# Make sure we can run config.sub.
|
# Make sure we can run config.sub.
|
||||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||||
as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
||||||
$as_echo_n "checking build system type... " >&6; }
|
$as_echo_n "checking build system type... " >&6; }
|
||||||
@ -4869,16 +4889,16 @@ else
|
|||||||
test "x$ac_build_alias" = x &&
|
test "x$ac_build_alias" = x &&
|
||||||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||||||
test "x$ac_build_alias" = x &&
|
test "x$ac_build_alias" = x &&
|
||||||
as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
|
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
|
||||||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||||||
as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
||||||
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
||||||
$as_echo "$ac_cv_build" >&6; }
|
$as_echo "$ac_cv_build" >&6; }
|
||||||
case $ac_cv_build in
|
case $ac_cv_build in
|
||||||
*-*-*) ;;
|
*-*-*) ;;
|
||||||
*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
build=$ac_cv_build
|
build=$ac_cv_build
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
@ -4903,7 +4923,7 @@ else
|
|||||||
ac_cv_host=$ac_cv_build
|
ac_cv_host=$ac_cv_build
|
||||||
else
|
else
|
||||||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||||||
as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@ -4911,7 +4931,7 @@ fi
|
|||||||
$as_echo "$ac_cv_host" >&6; }
|
$as_echo "$ac_cv_host" >&6; }
|
||||||
case $ac_cv_host in
|
case $ac_cv_host in
|
||||||
*-*-*) ;;
|
*-*-*) ;;
|
||||||
*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
host=$ac_cv_host
|
host=$ac_cv_host
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
@ -4936,7 +4956,7 @@ else
|
|||||||
ac_cv_target=$ac_cv_host
|
ac_cv_target=$ac_cv_host
|
||||||
else
|
else
|
||||||
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
||||||
as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@ -4944,7 +4964,7 @@ fi
|
|||||||
$as_echo "$ac_cv_target" >&6; }
|
$as_echo "$ac_cv_target" >&6; }
|
||||||
case $ac_cv_target in
|
case $ac_cv_target in
|
||||||
*-*-*) ;;
|
*-*-*) ;;
|
||||||
*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
|
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
target=$ac_cv_target
|
target=$ac_cv_target
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
@ -5088,8 +5108,8 @@ fi
|
|||||||
if test "$cross_compiling" = yes; then :
|
if test "$cross_compiling" = yes; then :
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
as_fn_error "cannot run test program while cross compiling
|
as_fn_error $? "cannot run test program while cross compiling
|
||||||
See \`config.log' for more details." "$LINENO" 5; }
|
See \`config.log' for more details" "$LINENO" 5 ; }
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<_ACEOF
|
cat > conftest.$ac_ext <<_ACEOF
|
||||||
-module(conftest).
|
-module(conftest).
|
||||||
@ -5243,6 +5263,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
|
|||||||
|
|
||||||
ac_libobjs=
|
ac_libobjs=
|
||||||
ac_ltlibobjs=
|
ac_ltlibobjs=
|
||||||
|
U=
|
||||||
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
||||||
# 1. Remove the extension, and $U if already installed.
|
# 1. Remove the extension, and $U if already installed.
|
||||||
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
||||||
@ -5404,19 +5425,19 @@ export LANGUAGE
|
|||||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||||
|
|
||||||
|
|
||||||
# as_fn_error ERROR [LINENO LOG_FD]
|
# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||||||
# ---------------------------------
|
# ----------------------------------------
|
||||||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||||||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||||||
# script with status $?, using 1 if that was 0.
|
# script with STATUS, using 1 if that was 0.
|
||||||
as_fn_error ()
|
as_fn_error ()
|
||||||
{
|
{
|
||||||
as_status=$?; test $as_status -eq 0 && as_status=1
|
as_status=$1; test $as_status -eq 0 && as_status=1
|
||||||
if test "$3"; then
|
if test "$4"; then
|
||||||
as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||||||
fi
|
fi
|
||||||
$as_echo "$as_me: error: $1" >&2
|
$as_echo "$as_me: error: $2" >&2
|
||||||
as_fn_exit $as_status
|
as_fn_exit $as_status
|
||||||
} # as_fn_error
|
} # as_fn_error
|
||||||
|
|
||||||
@ -5612,7 +5633,7 @@ $as_echo X"$as_dir" |
|
|||||||
test -d "$as_dir" && break
|
test -d "$as_dir" && break
|
||||||
done
|
done
|
||||||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||||||
} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||||||
|
|
||||||
|
|
||||||
} # as_fn_mkdir_p
|
} # as_fn_mkdir_p
|
||||||
@ -5666,7 +5687,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by ejabberd $as_me 2.1.x, which was
|
This file was extended by ejabberd $as_me 2.1.x, which was
|
||||||
generated by GNU Autoconf 2.65. Invocation command line was
|
generated by GNU Autoconf 2.67. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
CONFIG_HEADERS = $CONFIG_HEADERS
|
CONFIG_HEADERS = $CONFIG_HEADERS
|
||||||
@ -5719,10 +5740,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|||||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
ejabberd config.status 2.1.x
|
ejabberd config.status 2.1.x
|
||||||
configured by $0, generated by GNU Autoconf 2.65,
|
configured by $0, generated by GNU Autoconf 2.67,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||||
This config.status script is free software; the Free Software Foundation
|
This config.status script is free software; the Free Software Foundation
|
||||||
gives unlimited permission to copy, distribute and modify it."
|
gives unlimited permission to copy, distribute and modify it."
|
||||||
|
|
||||||
@ -5737,11 +5758,16 @@ ac_need_defaults=:
|
|||||||
while test $# != 0
|
while test $# != 0
|
||||||
do
|
do
|
||||||
case $1 in
|
case $1 in
|
||||||
--*=*)
|
--*=?*)
|
||||||
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||||||
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
||||||
ac_shift=:
|
ac_shift=:
|
||||||
;;
|
;;
|
||||||
|
--*=)
|
||||||
|
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||||||
|
ac_optarg=
|
||||||
|
ac_shift=:
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
ac_option=$1
|
ac_option=$1
|
||||||
ac_optarg=$2
|
ac_optarg=$2
|
||||||
@ -5763,6 +5789,7 @@ do
|
|||||||
$ac_shift
|
$ac_shift
|
||||||
case $ac_optarg in
|
case $ac_optarg in
|
||||||
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||||||
|
'') as_fn_error $? "missing file argument" ;;
|
||||||
esac
|
esac
|
||||||
as_fn_append CONFIG_FILES " '$ac_optarg'"
|
as_fn_append CONFIG_FILES " '$ac_optarg'"
|
||||||
ac_need_defaults=false;;
|
ac_need_defaults=false;;
|
||||||
@ -5773,7 +5800,7 @@ do
|
|||||||
ac_cs_silent=: ;;
|
ac_cs_silent=: ;;
|
||||||
|
|
||||||
# This is an error.
|
# This is an error.
|
||||||
-*) as_fn_error "unrecognized option: \`$1'
|
-*) as_fn_error $? "unrecognized option: \`$1'
|
||||||
Try \`$0 --help' for more information." ;;
|
Try \`$0 --help' for more information." ;;
|
||||||
|
|
||||||
*) as_fn_append ac_config_targets " $1"
|
*) as_fn_append ac_config_targets " $1"
|
||||||
@ -5836,7 +5863,7 @@ do
|
|||||||
"$make_odbc") CONFIG_FILES="$CONFIG_FILES $make_odbc" ;;
|
"$make_odbc") CONFIG_FILES="$CONFIG_FILES $make_odbc" ;;
|
||||||
"$make_ejabberd_zlib") CONFIG_FILES="$CONFIG_FILES $make_ejabberd_zlib" ;;
|
"$make_ejabberd_zlib") CONFIG_FILES="$CONFIG_FILES $make_ejabberd_zlib" ;;
|
||||||
|
|
||||||
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -5872,7 +5899,7 @@ $debug ||
|
|||||||
{
|
{
|
||||||
tmp=./conf$$-$RANDOM
|
tmp=./conf$$-$RANDOM
|
||||||
(umask 077 && mkdir "$tmp")
|
(umask 077 && mkdir "$tmp")
|
||||||
} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
||||||
|
|
||||||
# Set up the scripts for CONFIG_FILES section.
|
# Set up the scripts for CONFIG_FILES section.
|
||||||
# No need to generate them if there are no CONFIG_FILES.
|
# No need to generate them if there are no CONFIG_FILES.
|
||||||
@ -5889,7 +5916,7 @@ if test "x$ac_cr" = x; then
|
|||||||
fi
|
fi
|
||||||
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||||||
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||||||
ac_cs_awk_cr='\r'
|
ac_cs_awk_cr='\\r'
|
||||||
else
|
else
|
||||||
ac_cs_awk_cr=$ac_cr
|
ac_cs_awk_cr=$ac_cr
|
||||||
fi
|
fi
|
||||||
@ -5903,18 +5930,18 @@ _ACEOF
|
|||||||
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
||||||
echo "_ACEOF"
|
echo "_ACEOF"
|
||||||
} >conf$$subs.sh ||
|
} >conf$$subs.sh ||
|
||||||
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||||||
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
. ./conf$$subs.sh ||
|
. ./conf$$subs.sh ||
|
||||||
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||||||
|
|
||||||
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
||||||
if test $ac_delim_n = $ac_delim_num; then
|
if test $ac_delim_n = $ac_delim_num; then
|
||||||
break
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||||||
else
|
else
|
||||||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||||||
fi
|
fi
|
||||||
@ -6003,20 +6030,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
|||||||
else
|
else
|
||||||
cat
|
cat
|
||||||
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
||||||
|| as_fn_error "could not setup config files machinery" "$LINENO" 5
|
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
|
||||||
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
|
||||||
# trailing colons and then remove the whole line if VPATH becomes empty
|
# trailing colons and then remove the whole line if VPATH becomes empty
|
||||||
# (actually we leave an empty line to preserve line numbers).
|
# (actually we leave an empty line to preserve line numbers).
|
||||||
if test "x$srcdir" = x.; then
|
if test "x$srcdir" = x.; then
|
||||||
ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
|
||||||
s/:*\$(srcdir):*/:/
|
h
|
||||||
s/:*\${srcdir}:*/:/
|
s///
|
||||||
s/:*@srcdir@:*/:/
|
s/^/:/
|
||||||
s/^\([^=]*=[ ]*\):*/\1/
|
s/[ ]*$/:/
|
||||||
|
s/:\$(srcdir):/:/g
|
||||||
|
s/:\${srcdir}:/:/g
|
||||||
|
s/:@srcdir@:/:/g
|
||||||
|
s/^:*//
|
||||||
s/:*$//
|
s/:*$//
|
||||||
|
x
|
||||||
|
s/\(=[ ]*\).*/\1/
|
||||||
|
G
|
||||||
|
s/\n//
|
||||||
s/^[^=]*=[ ]*$//
|
s/^[^=]*=[ ]*$//
|
||||||
}'
|
}'
|
||||||
fi
|
fi
|
||||||
@ -6034,7 +6069,7 @@ do
|
|||||||
esac
|
esac
|
||||||
case $ac_mode$ac_tag in
|
case $ac_mode$ac_tag in
|
||||||
:[FHL]*:*);;
|
:[FHL]*:*);;
|
||||||
:L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
|
||||||
:[FH]-) ac_tag=-:-;;
|
:[FH]-) ac_tag=-:-;;
|
||||||
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
||||||
esac
|
esac
|
||||||
@ -6062,7 +6097,7 @@ do
|
|||||||
[\\/$]*) false;;
|
[\\/$]*) false;;
|
||||||
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
||||||
esac ||
|
esac ||
|
||||||
as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
||||||
as_fn_append ac_file_inputs " '$ac_f'"
|
as_fn_append ac_file_inputs " '$ac_f'"
|
||||||
@ -6089,7 +6124,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
|
|||||||
|
|
||||||
case $ac_tag in
|
case $ac_tag in
|
||||||
*:-:* | *:-) cat >"$tmp/stdin" \
|
*:-:* | *:-) cat >"$tmp/stdin" \
|
||||||
|| as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -6215,22 +6250,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
|||||||
$ac_datarootdir_hack
|
$ac_datarootdir_hack
|
||||||
"
|
"
|
||||||
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
||||||
|| as_fn_error "could not create $ac_file" "$LINENO" 5
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||||||
|
|
||||||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||||||
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||||||
which seems to be undefined. Please make sure it is defined." >&5
|
which seems to be undefined. Please make sure it is defined" >&5
|
||||||
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||||||
which seems to be undefined. Please make sure it is defined." >&2;}
|
which seems to be undefined. Please make sure it is defined" >&2;}
|
||||||
|
|
||||||
rm -f "$tmp/stdin"
|
rm -f "$tmp/stdin"
|
||||||
case $ac_file in
|
case $ac_file in
|
||||||
-) cat "$tmp/out" && rm -f "$tmp/out";;
|
-) cat "$tmp/out" && rm -f "$tmp/out";;
|
||||||
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
||||||
esac \
|
esac \
|
||||||
|| as_fn_error "could not create $ac_file" "$LINENO" 5
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
||||||
@ -6245,7 +6280,7 @@ _ACEOF
|
|||||||
ac_clean_files=$ac_clean_files_save
|
ac_clean_files=$ac_clean_files_save
|
||||||
|
|
||||||
test $ac_write_fail = 0 ||
|
test $ac_write_fail = 0 ||
|
||||||
as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||||||
|
|
||||||
|
|
||||||
# configure is writing to config.log, and then calls config.status.
|
# configure is writing to config.log, and then calls config.status.
|
||||||
@ -6266,7 +6301,7 @@ if test "$no_create" != yes; then
|
|||||||
exec 5>>config.log
|
exec 5>>config.log
|
||||||
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
||||||
# would make configure fail if this is the last instruction.
|
# would make configure fail if this is the last instruction.
|
||||||
$ac_cs_success || as_fn_exit $?
|
$ac_cs_success || as_fn_exit 1
|
||||||
fi
|
fi
|
||||||
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
||||||
|
@ -67,6 +67,15 @@ AC_ARG_ENABLE(roster_gateway_workaround,
|
|||||||
esac],[roster_gateway_workaround=false])
|
esac],[roster_gateway_workaround=false])
|
||||||
AC_SUBST(roster_gateway_workaround)
|
AC_SUBST(roster_gateway_workaround)
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(flash_hack,
|
||||||
|
[AC_HELP_STRING([--enable-flash-hack], [support Adobe Flash client XML (default: no)])],
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) flash_hack=true ;;
|
||||||
|
no) flash_hack=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-flash-hack) ;;
|
||||||
|
esac],[flash_hack=false])
|
||||||
|
AC_SUBST(flash_hack)
|
||||||
|
|
||||||
AC_ARG_ENABLE(mssql,
|
AC_ARG_ENABLE(mssql,
|
||||||
[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
|
[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
|
||||||
[case "${enableval}" in
|
[case "${enableval}" in
|
||||||
|
@ -31,6 +31,13 @@
|
|||||||
-define(CONFIG_PATH, "ejabberd.cfg").
|
-define(CONFIG_PATH, "ejabberd.cfg").
|
||||||
-define(LOG_PATH, "ejabberd.log").
|
-define(LOG_PATH, "ejabberd.log").
|
||||||
|
|
||||||
|
-ifdef(ENABLE_FLASH_HACK).
|
||||||
|
-define(FLASH_HACK, true).
|
||||||
|
-else.
|
||||||
|
-define(FLASH_HACK, false).
|
||||||
|
-endif.
|
||||||
|
|
||||||
|
|
||||||
-define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/").
|
-define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/").
|
||||||
|
|
||||||
-define(S2STIMEOUT, 600000).
|
-define(S2STIMEOUT, 600000).
|
||||||
|
@ -68,6 +68,42 @@
|
|||||||
-include("mod_privacy.hrl").
|
-include("mod_privacy.hrl").
|
||||||
-include("ejabberd_c2s.hrl").
|
-include("ejabberd_c2s.hrl").
|
||||||
|
|
||||||
|
-define(SETS, gb_sets).
|
||||||
|
-define(DICT, dict).
|
||||||
|
|
||||||
|
%% pres_a contains all the presence available send (either through roster mechanism or directed).
|
||||||
|
%% Directed presence unavailable remove user from pres_a.
|
||||||
|
-record(state, {socket,
|
||||||
|
sockmod,
|
||||||
|
socket_monitor,
|
||||||
|
xml_socket,
|
||||||
|
streamid,
|
||||||
|
sasl_state,
|
||||||
|
access,
|
||||||
|
shaper,
|
||||||
|
zlib = false,
|
||||||
|
tls = false,
|
||||||
|
tls_required = false,
|
||||||
|
tls_enabled = false,
|
||||||
|
tls_options = [],
|
||||||
|
authenticated = false,
|
||||||
|
jid,
|
||||||
|
user = "", server = ?MYNAME, resource = "",
|
||||||
|
sid,
|
||||||
|
pres_t = ?SETS:new(),
|
||||||
|
pres_f = ?SETS:new(),
|
||||||
|
pres_a = ?SETS:new(),
|
||||||
|
pres_i = ?SETS:new(),
|
||||||
|
pres_last, pres_pri,
|
||||||
|
pres_timestamp,
|
||||||
|
pres_invis = false,
|
||||||
|
privacy_list = #userlist{},
|
||||||
|
conn = unknown,
|
||||||
|
auth_module = unknown,
|
||||||
|
ip,
|
||||||
|
lang,
|
||||||
|
flash_connection = false}).
|
||||||
|
|
||||||
%-define(DBGFSM, true).
|
%-define(DBGFSM, true).
|
||||||
|
|
||||||
-ifdef(DBGFSM).
|
-ifdef(DBGFSM).
|
||||||
@ -98,6 +134,13 @@
|
|||||||
"id='~s' from='~s'~s~s>"
|
"id='~s' from='~s'~s~s>"
|
||||||
).
|
).
|
||||||
|
|
||||||
|
-define(FLASH_STREAM_HEADER,
|
||||||
|
"<?xml version='1.0'?>"
|
||||||
|
"<flash:stream xmlns='jabber:client' "
|
||||||
|
"xmlns:stream='http://etherx.jabber.org/streams' "
|
||||||
|
"id='~s' from='~s'~s~s>"
|
||||||
|
).
|
||||||
|
|
||||||
-define(STREAM_TRAILER, "</stream:stream>").
|
-define(STREAM_TRAILER, "</stream:stream>").
|
||||||
|
|
||||||
-define(INVALID_NS_ERR, ?SERR_INVALID_NAMESPACE).
|
-define(INVALID_NS_ERR, ?SERR_INVALID_NAMESPACE).
|
||||||
@ -252,15 +295,25 @@ get_subscribed(FsmRef) ->
|
|||||||
%% {stop, Reason, NewStateData}
|
%% {stop, Reason, NewStateData}
|
||||||
%%----------------------------------------------------------------------
|
%%----------------------------------------------------------------------
|
||||||
|
|
||||||
wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
|
wait_for_stream({xmlstreamstart, Name, Attrs}, StateData) ->
|
||||||
DefaultLang = case ?MYLANG of
|
DefaultLang = case ?MYLANG of
|
||||||
undefined ->
|
undefined ->
|
||||||
"en";
|
"en";
|
||||||
DL ->
|
DL ->
|
||||||
DL
|
DL
|
||||||
end,
|
end,
|
||||||
case xml:get_attr_s("xmlns:stream", Attrs) of
|
|
||||||
?NS_STREAM ->
|
case {xml:get_attr_s("xmlns:stream", Attrs),
|
||||||
|
xml:get_attr_s("xmlns:flash", Attrs),
|
||||||
|
?FLASH_HACK,
|
||||||
|
StateData#state.flash_connection} of
|
||||||
|
{_, ?NS_FLASH_STREAM, true, false} ->
|
||||||
|
%% Flash client connecting - attention!
|
||||||
|
%% Some of them don't provide an xmlns:stream attribute -
|
||||||
|
%% compensate for that.
|
||||||
|
wait_for_stream({xmlstreamstart, Name, [{"xmlns:stream", ?NS_STREAM}|Attrs]},
|
||||||
|
StateData#state{flash_connection = true});
|
||||||
|
{?NS_STREAM, _, _, _} ->
|
||||||
Server = jlib:nameprep(xml:get_attr_s("to", Attrs)),
|
Server = jlib:nameprep(xml:get_attr_s("to", Attrs)),
|
||||||
case lists:member(Server, ?MYHOSTS) of
|
case lists:member(Server, ?MYHOSTS) of
|
||||||
true ->
|
true ->
|
||||||
@ -403,11 +456,17 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
|
|||||||
send_trailer(StateData),
|
send_trailer(StateData),
|
||||||
{stop, normal, StateData}
|
{stop, normal, StateData}
|
||||||
end;
|
end;
|
||||||
|
_ ->
|
||||||
|
case Name of
|
||||||
|
"policy-file-request" ->
|
||||||
|
send_text(StateData, flash_policy_string()),
|
||||||
|
{stop, normal, StateData};
|
||||||
_ ->
|
_ ->
|
||||||
send_header(StateData, ?MYNAME, "", DefaultLang),
|
send_header(StateData, ?MYNAME, "", DefaultLang),
|
||||||
send_element(StateData, ?INVALID_NS_ERR),
|
send_element(StateData, ?INVALID_NS_ERR),
|
||||||
send_trailer(StateData),
|
send_trailer(StateData),
|
||||||
{stop, normal, StateData}
|
{stop, normal, StateData}
|
||||||
|
end
|
||||||
end;
|
end;
|
||||||
|
|
||||||
wait_for_stream(timeout, StateData) ->
|
wait_for_stream(timeout, StateData) ->
|
||||||
@ -1509,8 +1568,15 @@ change_shaper(StateData, JID) ->
|
|||||||
(StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper).
|
(StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper).
|
||||||
|
|
||||||
send_text(StateData, Text) ->
|
send_text(StateData, Text) ->
|
||||||
?DEBUG("Send XML on stream = ~p", [Text]),
|
?DEBUG("Send XML on stream = ~p", [lists:flatten(Text)]),
|
||||||
(StateData#state.sockmod):send(StateData#state.socket, Text).
|
Text1 =
|
||||||
|
if ?FLASH_HACK and StateData#state.flash_connection ->
|
||||||
|
%% send a null byte after each stanza to Flash clients
|
||||||
|
[Text, 0];
|
||||||
|
true ->
|
||||||
|
Text
|
||||||
|
end,
|
||||||
|
(StateData#state.sockmod):send(StateData#state.socket, Text1).
|
||||||
|
|
||||||
send_element(StateData, El) when StateData#state.xml_socket ->
|
send_element(StateData, El) when StateData#state.xml_socket ->
|
||||||
(StateData#state.sockmod):send_xml(StateData#state.socket,
|
(StateData#state.sockmod):send_xml(StateData#state.socket,
|
||||||
@ -1518,6 +1584,15 @@ send_element(StateData, El) when StateData#state.xml_socket ->
|
|||||||
send_element(StateData, El) ->
|
send_element(StateData, El) ->
|
||||||
send_text(StateData, xml:element_to_binary(El)).
|
send_text(StateData, xml:element_to_binary(El)).
|
||||||
|
|
||||||
|
send_header(StateData,Server, Version, Lang)
|
||||||
|
when StateData#state.flash_connection ->
|
||||||
|
Header = io_lib:format(?FLASH_STREAM_HEADER,
|
||||||
|
[StateData#state.streamid,
|
||||||
|
Server,
|
||||||
|
Version,
|
||||||
|
Lang]),
|
||||||
|
send_text(StateData, Header);
|
||||||
|
|
||||||
send_header(StateData, Server, Version, Lang)
|
send_header(StateData, Server, Version, Lang)
|
||||||
when StateData#state.xml_socket ->
|
when StateData#state.xml_socket ->
|
||||||
VersionAttr =
|
VersionAttr =
|
||||||
@ -2364,3 +2439,28 @@ pack_string(String, Pack) ->
|
|||||||
none ->
|
none ->
|
||||||
{String, gb_trees:insert(String, String, Pack)}
|
{String, gb_trees:insert(String, String, Pack)}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
%% @spec () -> string()
|
||||||
|
%% @doc Build the content of a Flash policy file.
|
||||||
|
%% It specifies as domain "*".
|
||||||
|
%% It specifies as to-ports the ports that serve ejabberd_c2s.
|
||||||
|
flash_policy_string() ->
|
||||||
|
Listen = ejabberd_config:get_local_option(listen),
|
||||||
|
ClientPortsDeep = ["," ++ integer_to_list(Port)
|
||||||
|
|| {{Port,_,_}, ejabberd_c2s, _Opts} <- Listen],
|
||||||
|
%% NOTE: The function string:join/2 was introduced in Erlang/OTP R12B-0
|
||||||
|
%% so it can't be used yet in ejabberd.
|
||||||
|
ToPortsString = case lists:flatten(ClientPortsDeep) of
|
||||||
|
[$, | Tail] -> Tail;
|
||||||
|
_ -> []
|
||||||
|
end,
|
||||||
|
|
||||||
|
"<?xml version=\"1.0\"?>\n"
|
||||||
|
"<!DOCTYPE cross-domain-policy SYSTEM "
|
||||||
|
"\"http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd\">\n"
|
||||||
|
"<cross-domain-policy>\n"
|
||||||
|
" <allow-access-from domain=\"*\" to-ports=\""
|
||||||
|
++ ToPortsString ++
|
||||||
|
"\"/>\n"
|
||||||
|
"</cross-domain-policy>\n\0".
|
||||||
|
@ -138,6 +138,35 @@ static int expat_erl_control(ErlDrvData drv_data,
|
|||||||
case PARSE_COMMAND:
|
case PARSE_COMMAND:
|
||||||
case PARSE_FINAL_COMMAND:
|
case PARSE_FINAL_COMMAND:
|
||||||
ei_x_new_with_version(&event_buf);
|
ei_x_new_with_version(&event_buf);
|
||||||
|
#ifdef ENABLE_FLASH_HACK
|
||||||
|
/* Flash hack - Flash clients send a null byte after the stanza. Remove that... */
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int found_null = 0;
|
||||||
|
|
||||||
|
/* Maybe the Flash client sent many stanzas in one packet.
|
||||||
|
If so, there is a null byte between every stanza. */
|
||||||
|
for (i = 0; i < len; i++) {
|
||||||
|
if (buf[i] == '\0') {
|
||||||
|
buf[i] = ' ';
|
||||||
|
found_null = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* And also remove the closing slash if this is a
|
||||||
|
flash:stream element. Assume that flash:stream is the
|
||||||
|
last element in the packet, and entirely contained in
|
||||||
|
it. This requires that a null byte has been found. */
|
||||||
|
if (found_null && strstr(buf, "<flash:stream"))
|
||||||
|
/* buf[len - 1] is an erased null byte.
|
||||||
|
buf[len - 2] is >
|
||||||
|
buf[len - 3] is / (maybe)
|
||||||
|
*/
|
||||||
|
if (buf[len - 3] == '/')
|
||||||
|
buf[len - 3] = ' ';
|
||||||
|
}
|
||||||
|
#endif /* ENABLE_FLASH_HACK */
|
||||||
|
|
||||||
res = XML_Parse(d->parser, buf, len, command == PARSE_FINAL_COMMAND);
|
res = XML_Parse(d->parser, buf, len, command == PARSE_FINAL_COMMAND);
|
||||||
|
|
||||||
if(!res)
|
if(!res)
|
||||||
|
@ -67,6 +67,7 @@
|
|||||||
-define(NS_EJABBERD_CONFIG, "ejabberd:config").
|
-define(NS_EJABBERD_CONFIG, "ejabberd:config").
|
||||||
|
|
||||||
-define(NS_STREAM, "http://etherx.jabber.org/streams").
|
-define(NS_STREAM, "http://etherx.jabber.org/streams").
|
||||||
|
-define(NS_FLASH_STREAM, "http://www.jabber.com/streams/flash").
|
||||||
|
|
||||||
-define(NS_STANZAS, "urn:ietf:params:xml:ns:xmpp-stanzas").
|
-define(NS_STANZAS, "urn:ietf:params:xml:ns:xmpp-stanzas").
|
||||||
-define(NS_STREAMS, "urn:ietf:params:xml:ns:xmpp-streams").
|
-define(NS_STREAMS, "urn:ietf:params:xml:ns:xmpp-streams").
|
||||||
|
Loading…
Reference in New Issue
Block a user