From dc77fd190fb25d72ddcfde2f8499b30f0eb5cf6f Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Tue, 11 Sep 2012 14:27:29 +0200
Subject: [PATCH] configure fixes

---
 configure    | 52 +++++++++++++++++++---------------------------------
 configure.in | 46 ++++++++++++++++++----------------------------
 2 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/configure b/configure
index 8e6be26f..c0c6b62d 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index df673a3c..338e2ca5 100644
--- a/configure.in
+++ b/configure.in
@@ -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