removed multitenancy option from configure script

This commit is contained in:
SJ 2013-08-03 13:03:05 +02:00
parent 20345baf7d
commit bb7882cfc5
2 changed files with 10 additions and 27 deletions

17
configure vendored
View File

@ -698,7 +698,6 @@ enable_clamd
enable_memcached enable_memcached
enable_starttls enable_starttls
enable_tcpwrappers enable_tcpwrappers
enable_multitenancy
enable_tweak_sent_time enable_tweak_sent_time
with_database with_database
with_piler_user with_piler_user
@ -1324,7 +1323,6 @@ Optional Features:
--enable-memcached build memcached support --enable-memcached build memcached support
--enable-starttls build starttls support --enable-starttls build starttls support
--enable-tcpwrappers build tcpwrappers support --enable-tcpwrappers build tcpwrappers support
--enable-multitenancy build piler with multitenancy support (!!!EXPERIMENTAL!!!)
--tweak-sent-time tweak sent time --tweak-sent-time tweak sent time
Optional Packages: Optional Packages:
@ -3446,7 +3444,6 @@ have_zlib="no"
have_starttls="no" have_starttls="no"
have_tcpwrappers="no" have_tcpwrappers="no"
have_tweak_sent_time="no" have_tweak_sent_time="no"
have_multitenancy="no"
pdftotext="no" pdftotext="no"
catdoc="no" catdoc="no"
@ -3645,13 +3642,6 @@ ac_cv_lib_wrap=ac_cv_lib_wrap_main
fi fi
# Check whether --enable-multitenancy was given.
if test "${enable_multitenancy+set}" = set; then :
enableval=$enable_multitenancy; have_multitenancy=$enableval
else
have_multitenancy="no"
fi
@ -4656,13 +4646,6 @@ if test "$have_psql" = "yes"; then
fi fi
if test "$have_multitenancy" = "yes"; then
echo "multitenancy support: yes"
defs="$defs -DHAVE_MULTITENANCY"
objs="$objs multitenancy.o"
else
echo "multitenancy support: no"
fi
if test z`which pdftotext 2>/dev/null` != "z"; then if test z`which pdftotext 2>/dev/null` != "z"; then
pdftotext=`which pdftotext` pdftotext=`which pdftotext`

View File

@ -44,7 +44,7 @@ have_zlib="no"
have_starttls="no" have_starttls="no"
have_tcpwrappers="no" have_tcpwrappers="no"
have_tweak_sent_time="no" have_tweak_sent_time="no"
have_multitenancy="no" dnl have_multitenancy="no"
pdftotext="no" pdftotext="no"
catdoc="no" catdoc="no"
@ -127,8 +127,8 @@ if test "$want_tcpwrappers" = "yes"; then
fi fi
AC_ARG_ENABLE(multitenancy, dnl AC_ARG_ENABLE(multitenancy,
[ --enable-multitenancy build piler with multitenancy support (!!!EXPERIMENTAL!!!)], have_multitenancy=$enableval, have_multitenancy="no") dnl [ --enable-multitenancy build piler with multitenancy support (!!!EXPERIMENTAL!!!)], have_multitenancy=$enableval, have_multitenancy="no")
@ -405,13 +405,13 @@ if test "$have_psql" = "yes"; then
fi fi
if test "$have_multitenancy" = "yes"; then dnl if test "$have_multitenancy" = "yes"; then
echo "multitenancy support: yes" dnl echo "multitenancy support: yes"
defs="$defs -DHAVE_MULTITENANCY" dnl defs="$defs -DHAVE_MULTITENANCY"
objs="$objs multitenancy.o" dnl objs="$objs multitenancy.o"
else dnl else
echo "multitenancy support: no" dnl echo "multitenancy support: no"
fi dnl fi
if test z`which pdftotext 2>/dev/null` != "z"; then if test z`which pdftotext 2>/dev/null` != "z"; then
pdftotext=`which pdftotext` pdftotext=`which pdftotext`