Add --enable-all compiler option
This commit is contained in:
parent
3d4775d555
commit
eedd9496e4
|
@ -560,8 +560,6 @@ PACKAGE_URL=''
|
|||
ac_default_prefix=/
|
||||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
RELEASE_DIR
|
||||
INSTALLUSER
|
||||
http
|
||||
pubsub_ng
|
||||
debug
|
||||
|
@ -580,6 +578,7 @@ transient_supervisors
|
|||
flash_hack
|
||||
roster_gateway_workaround
|
||||
hipe
|
||||
INSTALLUSER
|
||||
MAKE
|
||||
REBAR
|
||||
ESCRIPT
|
||||
|
@ -652,6 +651,7 @@ enable_iconv
|
|||
enable_debug
|
||||
enable_pubsub_ng
|
||||
enable_http
|
||||
enable_all
|
||||
enable_user
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
|
@ -1299,6 +1299,11 @@ Optional Features:
|
|||
--enable-pubsub_ng enable PubSub NG (default: no)
|
||||
--enable-http build external HTTP libraries ('ibrowse' and
|
||||
'lhttpc', default: no)
|
||||
--enable-all same as --enable-nif --enable-mysql --enable-pgsql
|
||||
--enable-pam --enable-zlib --enable-stun
|
||||
--enable-riak --enable-json --enable-iconv
|
||||
--enable-debug --enable-pubsub_ng --enable-http
|
||||
(useful for Dialyzer checks, default: no)
|
||||
--enable-user[[[=USER]]]
|
||||
allow this system user to start ejabberd (default:
|
||||
no)
|
||||
|
@ -2485,7 +2490,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-roster_gateway_workaround was given.
|
||||
if test "${enable_roster_gateway_workaround+set}" = set; then :
|
||||
enableval=$enable_roster_gateway_workaround; case "${enableval}" in
|
||||
|
@ -2498,7 +2502,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-flash_hack was given.
|
||||
if test "${enable_flash_hack+set}" = set; then :
|
||||
enableval=$enable_flash_hack; case "${enableval}" in
|
||||
|
@ -2511,7 +2514,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-transient_supervisors was given.
|
||||
if test "${enable_transient_supervisors+set}" = set; then :
|
||||
enableval=$enable_transient_supervisors; case "${enableval}" in
|
||||
|
@ -2524,7 +2526,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-full_xml was given.
|
||||
if test "${enable_full_xml+set}" = set; then :
|
||||
enableval=$enable_full_xml; case "${enableval}" in
|
||||
|
@ -2537,7 +2538,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-nif was given.
|
||||
if test "${enable_nif+set}" = set; then :
|
||||
enableval=$enable_nif; case "${enableval}" in
|
||||
|
@ -2550,7 +2550,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-mssql was given.
|
||||
if test "${enable_mssql+set}" = set; then :
|
||||
enableval=$enable_mssql; case "${enableval}" in
|
||||
|
@ -2563,7 +2562,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-mysql was given.
|
||||
if test "${enable_mysql+set}" = set; then :
|
||||
enableval=$enable_mysql; case "${enableval}" in
|
||||
|
@ -2576,7 +2574,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pgsql was given.
|
||||
if test "${enable_pgsql+set}" = set; then :
|
||||
enableval=$enable_pgsql; case "${enableval}" in
|
||||
|
@ -2589,7 +2586,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pam was given.
|
||||
if test "${enable_pam+set}" = set; then :
|
||||
enableval=$enable_pam; case "${enableval}" in
|
||||
|
@ -2602,7 +2598,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-zlib was given.
|
||||
if test "${enable_zlib+set}" = set; then :
|
||||
enableval=$enable_zlib; case "${enableval}" in
|
||||
|
@ -2615,7 +2610,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-stun was given.
|
||||
if test "${enable_stun+set}" = set; then :
|
||||
enableval=$enable_stun; case "${enableval}" in
|
||||
|
@ -2628,7 +2622,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-riak was given.
|
||||
if test "${enable_riak+set}" = set; then :
|
||||
enableval=$enable_riak; case "${enableval}" in
|
||||
|
@ -2641,7 +2634,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-json was given.
|
||||
if test "${enable_json+set}" = set; then :
|
||||
enableval=$enable_json; case "${enableval}" in
|
||||
|
@ -2654,7 +2646,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-iconv was given.
|
||||
if test "${enable_iconv+set}" = set; then :
|
||||
enableval=$enable_iconv; case "${enableval}" in
|
||||
|
@ -2667,7 +2658,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-debug was given.
|
||||
if test "${enable_debug+set}" = set; then :
|
||||
enableval=$enable_debug; case "${enableval}" in
|
||||
|
@ -2680,7 +2670,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pubsub_ng was given.
|
||||
if test "${enable_pubsub_ng+set}" = set; then :
|
||||
enableval=$enable_pubsub_ng; case "${enableval}" in
|
||||
|
@ -2693,7 +2682,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-http was given.
|
||||
if test "${enable_http+set}" = set; then :
|
||||
enableval=$enable_http; case "${enableval}" in
|
||||
|
@ -2706,6 +2694,15 @@ else
|
|||
fi
|
||||
|
||||
|
||||
# Check whether --enable-all was given.
|
||||
if test "${enable_all+set}" = set; then :
|
||||
enableval=$enable_all; case "${enableval}" in
|
||||
yes) nif=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true pubsub_ng=true http=true ;;
|
||||
no) nif=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false pubsub_ng=false http=false ;;
|
||||
*) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5 ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile config.vars src/ejabberd.app.src"
|
||||
|
||||
|
@ -2726,7 +2723,23 @@ if test "$ENABLEUSER" != ""; then
|
|||
|
||||
fi
|
||||
|
||||
RELEASE_DIR=$(pwd)/rel/ejabberd
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
|
46
configure.ac
46
configure.ac
|
@ -49,7 +49,6 @@ AC_ARG_ENABLE(hipe,
|
|||
no) hipe=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-hipe) ;;
|
||||
esac],[hipe=false])
|
||||
AC_SUBST(hipe)
|
||||
|
||||
AC_ARG_ENABLE(roster_gateway_workaround,
|
||||
[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
|
||||
|
@ -58,7 +57,6 @@ AC_ARG_ENABLE(roster_gateway_workaround,
|
|||
no) roster_gateway_workaround=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
|
||||
esac],[roster_gateway_workaround=false])
|
||||
AC_SUBST(roster_gateway_workaround)
|
||||
|
||||
AC_ARG_ENABLE(flash_hack,
|
||||
[AC_HELP_STRING([--enable-flash-hack], [support Adobe Flash client XML (default: no)])],
|
||||
|
@ -67,7 +65,6 @@ AC_ARG_ENABLE(flash_hack,
|
|||
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(transient_supervisors,
|
||||
[AC_HELP_STRING([--enable-transient_supervisors], [use Erlang supervision for transient process (default: no)])],
|
||||
|
@ -76,7 +73,6 @@ AC_ARG_ENABLE(transient_supervisors,
|
|||
no) transient_supervisors=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-transient_supervisors) ;;
|
||||
esac],[transient_supervisors=false])
|
||||
AC_SUBST(transient_supervisors)
|
||||
|
||||
AC_ARG_ENABLE(full_xml,
|
||||
[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
|
||||
|
@ -85,7 +81,6 @@ AC_ARG_ENABLE(full_xml,
|
|||
no) full_xml=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-full-xml) ;;
|
||||
esac],[full_xml=false])
|
||||
AC_SUBST(full_xml)
|
||||
|
||||
AC_ARG_ENABLE(nif,
|
||||
[AC_HELP_STRING([--enable-nif], [replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no)])],
|
||||
|
@ -94,7 +89,6 @@ AC_ARG_ENABLE(nif,
|
|||
no) nif=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-nif) ;;
|
||||
esac],[nif=false])
|
||||
AC_SUBST(nif)
|
||||
|
||||
AC_ARG_ENABLE(mssql,
|
||||
[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
|
||||
|
@ -103,7 +97,6 @@ AC_ARG_ENABLE(mssql,
|
|||
no) db_type=generic ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
|
||||
esac],[db_type=generic])
|
||||
AC_SUBST(db_type)
|
||||
|
||||
AC_ARG_ENABLE(mysql,
|
||||
[AC_HELP_STRING([--enable-mysql], [enable MySQL support (default: no)])],
|
||||
|
@ -112,7 +105,6 @@ AC_ARG_ENABLE(mysql,
|
|||
no) mysql=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;;
|
||||
esac],[mysql=false])
|
||||
AC_SUBST(mysql)
|
||||
|
||||
AC_ARG_ENABLE(pgsql,
|
||||
[AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL support (default: no)])],
|
||||
|
@ -121,7 +113,6 @@ AC_ARG_ENABLE(pgsql,
|
|||
no) pgsql=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-pgsql) ;;
|
||||
esac],[pgsql=false])
|
||||
AC_SUBST(pgsql)
|
||||
|
||||
AC_ARG_ENABLE(pam,
|
||||
[AC_HELP_STRING([--enable-pam], [enable PAM support (default: no)])],
|
||||
|
@ -130,7 +121,6 @@ AC_ARG_ENABLE(pam,
|
|||
no) pam=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-pam) ;;
|
||||
esac],[pam=false])
|
||||
AC_SUBST(pam)
|
||||
|
||||
AC_ARG_ENABLE(zlib,
|
||||
[AC_HELP_STRING([--enable-zlib], [enable Stream Compression (XEP-0138) using zlib (default: yes)])],
|
||||
|
@ -139,7 +129,6 @@ AC_ARG_ENABLE(zlib,
|
|||
no) zlib=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;;
|
||||
esac],[zlib=true])
|
||||
AC_SUBST(zlib)
|
||||
|
||||
AC_ARG_ENABLE(stun,
|
||||
[AC_HELP_STRING([--enable-stun], [enable STUN support (default: no)])],
|
||||
|
@ -148,7 +137,6 @@ AC_ARG_ENABLE(stun,
|
|||
no) stun=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-stun) ;;
|
||||
esac],[stun=false])
|
||||
AC_SUBST(stun)
|
||||
|
||||
AC_ARG_ENABLE(riak,
|
||||
[AC_HELP_STRING([--enable-riak], [enable Riak support (default: no)])],
|
||||
|
@ -157,7 +145,6 @@ AC_ARG_ENABLE(riak,
|
|||
no) riak=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-riak) ;;
|
||||
esac],[riak=false])
|
||||
AC_SUBST(riak)
|
||||
|
||||
AC_ARG_ENABLE(json,
|
||||
[AC_HELP_STRING([--enable-json], [enable JSON support for mod_bosh (default: no)])],
|
||||
|
@ -166,7 +153,6 @@ AC_ARG_ENABLE(json,
|
|||
no) json=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-json) ;;
|
||||
esac],[json=false])
|
||||
AC_SUBST(json)
|
||||
|
||||
AC_ARG_ENABLE(iconv,
|
||||
[AC_HELP_STRING([--enable-iconv], [enable iconv support (default: no)])],
|
||||
|
@ -175,7 +161,6 @@ AC_ARG_ENABLE(iconv,
|
|||
no) iconv=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-iconv) ;;
|
||||
esac],[iconv=false])
|
||||
AC_SUBST(iconv)
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
[AC_HELP_STRING([--enable-debug], [enable debug information (default: yes)])],
|
||||
|
@ -184,7 +169,6 @@ AC_ARG_ENABLE(debug,
|
|||
no) debug=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
|
||||
esac],[debug=true])
|
||||
AC_SUBST(debug)
|
||||
|
||||
AC_ARG_ENABLE(pubsub_ng,
|
||||
[AC_HELP_STRING([--enable-pubsub_ng], [enable PubSub NG (default: no)])],
|
||||
|
@ -193,7 +177,6 @@ AC_ARG_ENABLE(pubsub_ng,
|
|||
no) pubsub_ng=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-pubsub_ng) ;;
|
||||
esac],[pubsub_ng=false])
|
||||
AC_SUBST(pubsub_ng)
|
||||
|
||||
AC_ARG_ENABLE(http,
|
||||
[AC_HELP_STRING([--enable-http], [build external HTTP libraries ('ibrowse' and 'lhttpc', default: no)])],
|
||||
|
@ -202,7 +185,14 @@ AC_ARG_ENABLE(http,
|
|||
no) http=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-http) ;;
|
||||
esac],[http=false])
|
||||
AC_SUBST(http)
|
||||
|
||||
AC_ARG_ENABLE(all,
|
||||
[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --enable-riak --enable-json --enable-iconv --enable-debug --enable-pubsub_ng --enable-http (useful for Dialyzer checks, default: no)])],
|
||||
[case "${enableval}" in
|
||||
yes) nif=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true pubsub_ng=true http=true ;;
|
||||
no) nif=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false pubsub_ng=false http=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
|
||||
esac],[])
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
config.vars
|
||||
|
@ -222,7 +212,23 @@ if test "$ENABLEUSER" != ""; then
|
|||
AC_SUBST([INSTALLUSER], [$ENABLEUSER])
|
||||
fi
|
||||
|
||||
RELEASE_DIR=$(pwd)/rel/ejabberd
|
||||
AC_SUBST(RELEASE_DIR)
|
||||
AC_SUBST(hipe)
|
||||
AC_SUBST(roster_gateway_workaround)
|
||||
AC_SUBST(flash_hack)
|
||||
AC_SUBST(transient_supervisors)
|
||||
AC_SUBST(full_xml)
|
||||
AC_SUBST(nif)
|
||||
AC_SUBST(db_type)
|
||||
AC_SUBST(mysql)
|
||||
AC_SUBST(pgsql)
|
||||
AC_SUBST(pam)
|
||||
AC_SUBST(zlib)
|
||||
AC_SUBST(stun)
|
||||
AC_SUBST(riak)
|
||||
AC_SUBST(json)
|
||||
AC_SUBST(iconv)
|
||||
AC_SUBST(debug)
|
||||
AC_SUBST(pubsub_ng)
|
||||
AC_SUBST(http)
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
Loading…
Reference in New Issue