debian/control: Include `prlimit' and `x86-model' in the metapackage.

[misc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 59f5c94..4724381 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl -*-autoconf-*-
 dnl
-dnl Configuration script for nsict-utils
+dnl Configuration script for distorted-utils
 dnl
 dnl (c) 2008 Mark Wooding
 dnl
@@ -25,10 +25,21 @@ dnl--------------------------------------------------------------------------
 dnl Initialization.
 
 mdw_AUTO_VERSION
-AC_INIT([nsict-utils], AUTO_VERSION, [mdw@distorted.org.uk])
+AC_INIT([distorted-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
 
@@ -38,6 +49,8 @@ dnl C programming environment.
 ## Compiler.
 AC_PROG_CC
 AX_CFLAGS_WARN_ALL
+AC_PROG_CXX
+AX_CXXFLAGS_WARN_ALL
 
 ## Libraries.
 OLIBS=$LIBS
@@ -48,9 +61,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 +69,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 +93,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'])