X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/blobdiff_plain/1506eae061f60a133327dac2f6a437dfb1fb7ca2..ed68d9a61a11bc1ba3f80c1b51c2715906c62f87:/configure.ac?ds=inline

diff --git a/configure.ac b/configure.ac
index 59f5c94..97e1c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,17 @@ AC_INIT([nsict-utils], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([shadowfix.in])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
+
+AC_ARG_WITH([logdir],
+	AS_HELP_STRING([--with-logdir=DIR],
+		       [Write log files here.]),
+	[logdir=$withval],
+	[logdir=/var/log
+	 for i in /var/log /var/adm; do
+	   if test -d $i; then logdir=$i; break; fi
+	 done])
+AC_SUBST(logdir)
 
 AC_CANONICAL_HOST
 
@@ -48,9 +59,6 @@ LIBS=$OLIBS
 AC_CHECK_LIB([cdb], [cdb_seek], [have_cdb=yes], [have_cdb=no])
 AM_CONDITIONAL([HAVE_LIBCDB], [test $have_cdb = yes])
 
-AC_CHECK_LIB([spamc], [message_filter], [have_spamc=yes], [have_spamc=no])
-AM_CONDITIONAL([HAVE_LIBSPAMC], [test $have_spamc = yes])
-
 ## Packages.
 PKG_CHECK_MODULES([mLib], [mLib >= 2.0.4], [have_mLib=yes], [have_mLib=no])
 AM_CONDITIONAL([HAVE_MLIB], [test $have_mLib = yes])
@@ -59,8 +67,12 @@ PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1],
 		  [have_catacomb=yes], [have_catacomb=no])
 AM_CONDITIONAL([HAVE_CATACOMB], [test $have_catacomb = yes])
 
+## Functions.
+AC_CHECK_FUNC([prlimit], [have_prlimit=yes], [have_prlimit=no])
+AM_CONDITIONAL([HAVE_PRLIMIT], [test $have_prlimit = yes])
+
 ## Processor type.
-case "$host_cpu" in i?86) x86=yes;; *) x86=no;; esac
+case "$host_cpu" in i?86 | x86_64) x86=yes;; *) x86=no;; esac
 AM_CONDITIONAL([X86], [test $x86 = yes -a $GCC = yes])
 
 dnl--------------------------------------------------------------------------
@@ -79,9 +91,8 @@ AC_PATH_PROGS([PERL], [perl perl5], [false])
 AX_PROG_PERL_VERSION([5.004], [have_perl=yes], [have_perl=no])
 AM_CONDITIONAL([HAVE_PERL], [test $have_perl = yes])
 
-AC_ARG_WITH(
-	[perlmoddir],
-	AS_HELP_STRING([--perlmoddir=DIR],
+AC_ARG_WITH([perlmoddir],
+	AS_HELP_STRING([--with-perlmoddir=DIR],
 		       [Install Perl modules here.]),
 	[perlmoddir=$withval],
 	[perlmoddir='${libdir}/site_perl'])