bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-24 19:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure fixes

Browse Source
This commit is contained in:
SJ 2012-09-11 14:27:29 +02:00
parent 152351e373
commit dc77fd190f
2 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
configure vendored
View File

@ -3419,7 +3419,6 @@ pdftotext="no"
catdoc="no"
catppt="no"
xls2csv="no"
odt2txt="no"
have_static_build="no"
@ -4214,19 +4213,8 @@ fi
echo; echo
if test "$have_clamd" = "yes"; then
echo "clamd support: yes"
objs="$objs clamd.o"
defs="$defs -DHAVE_CLAMD"
fi
if test "$want_memcached" = "yes"; then
echo "memcached support: yes"
objs="$objs memc.o"
defs="$defs -DHAVE_MEMCACHED"
fi
echo "run as user: $RUNNING_USER"
echo "piler data directory: $data_dir/piler"
if test "$have_static_build" = "yes"; then
echo "link mode: static"
@ -4235,6 +4223,8 @@ else
echo "link mode: dynamic"
fi
echo
if test "$have_tre" = "yes"; then
echo "tre library: yes"
defs="$defs -DHAVE_TRE"
@ -4245,12 +4235,26 @@ if test "$have_zip" = "yes"; then
echo "zip library: yes"
cat >>confdefs.h <<_ACEOF
#define HAVE_ZIP "1"
#define HAVE_ZIP 1
_ACEOF
antispam_libs="$antispam_libs -lzip"
fi
echo
if test "$have_clamd" = "yes"; then
echo "clamd support: yes"
objs="$objs clamd.o"
defs="$defs -DHAVE_CLAMD"
fi
if test "$want_memcached" = "yes"; then
echo "memcached support: yes"
objs="$objs memc.o"
defs="$defs -DHAVE_MEMCACHED"
fi
if test "$have_mysql" = "yes"; then
defs="$defs -DNEED_MYSQL"
fi
@ -4300,34 +4304,16 @@ _ACEOF
fi
if test z`which odt2txt 2>/dev/null` != "z"; then
odt2txt=`which odt2txt`
cat >>confdefs.h <<_ACEOF
#define HAVE_ODT2TXT "$odt2txt"
_ACEOF
fi
echo
echo "pdftotext: $pdftotext"
echo "catdoc: $catdoc"
echo "catppt: $catppt"
echo "xls2csv: $xls2csv"
echo "odt2txt: $odt2txt"
id -u $RUNNING_USER 2>/dev/null 1>/dev/null
if test $? -eq 1; then echo "the user \"$RUNNING_USER\" does not exists, please create it, first with adduser..."; exit 1; fi
if test "$have_clamd" = "no" ; then
echo; echo
echo "You have not selected any antivirus support."
echo "piler will not protect you from hostile code coming in e-mail"
fi
echo "piler data directory: $data_dir/piler"
iv=`util/gen-iv.pl`
echo; echo

46
configure.in
View File

@ -45,7 +45,6 @@ pdftotext="no"
catdoc="no"
catppt="no"
xls2csv="no"
odt2txt="no"
have_static_build="no"
@ -250,19 +249,8 @@ fi
echo; echo
if test "$have_clamd" = "yes"; then
echo "clamd support: yes"
objs="$objs clamd.o"
defs="$defs -DHAVE_CLAMD"
fi
if test "$want_memcached" = "yes"; then
echo "memcached support: yes"
objs="$objs memc.o"
defs="$defs -DHAVE_MEMCACHED"
fi
echo "run as user: $RUNNING_USER"
echo "piler data directory: $data_dir/piler"
if test "$have_static_build" = "yes"; then
echo "link mode: static"
@ -271,6 +259,8 @@ else
echo "link mode: dynamic"
fi
echo
if test "$have_tre" = "yes"; then
echo "tre library: yes"
defs="$defs -DHAVE_TRE"
@ -283,6 +273,20 @@ if test "$have_zip" = "yes"; then
antispam_libs="$antispam_libs -lzip"
fi
echo
if test "$have_clamd" = "yes"; then
echo "clamd support: yes"
objs="$objs clamd.o"
defs="$defs -DHAVE_CLAMD"
fi
if test "$want_memcached" = "yes"; then
echo "memcached support: yes"
objs="$objs memc.o"
defs="$defs -DHAVE_MEMCACHED"
fi
if test "$have_mysql" = "yes"; then
defs="$defs -DNEED_MYSQL"
fi
@ -316,30 +320,16 @@ if test z`which xls2csv 2>/dev/null` != "z"; then
fi
if test z`which odt2txt 2>/dev/null` != "z"; then
odt2txt=`which odt2txt`
AC_DEFINE_UNQUOTED(HAVE_ODT2TXT, "$odt2txt", [path to odt2txt])
fi
echo
echo "pdftotext: $pdftotext"
echo "catdoc: $catdoc"
echo "catppt: $catppt"
echo "xls2csv: $xls2csv"
echo "odt2txt: $odt2txt"
id -u $RUNNING_USER 2>/dev/null 1>/dev/null
if test $? -eq 1; then echo "the user \"$RUNNING_USER\" does not exists, please create it, first with adduser..."; exit 1; fi
if test "$have_clamd" = "no" ; then
echo; echo
echo "You have not selected any antivirus support."
echo "piler will not protect you from hostile code coming in e-mail"
fi
echo "piler data directory: $data_dir/piler"
iv=`util/gen-iv.pl`
echo; echo