X-Git-Url: https://git.distorted.org.uk/~mdw/misc/blobdiff_plain/92f7c0021fcd48f17b0d48880937ded81db0bf89..7bba3c9c3dcd1a959dde4531e8e4a8b3ec0119da:/configure.ac

diff --git a/configure.ac b/configure.ac
index 814b686..b171850 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
 
@@ -59,6 +70,10 @@ 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
 AM_CONDITIONAL([X86], [test $x86 = yes -a $GCC = yes])
@@ -76,12 +91,11 @@ AM_CONDITIONAL([HAVE_PYMOD_CDB], [test $HAVE_PYMOD_CDB = yes])
 ## Perl.
 AC_ARG_VAR([PERL], [Path to your favourite Perl binary.])
 AC_PATH_PROGS([PERL], [perl perl5], [false])
-AC_PROG_PERL_VERSION([5.004], [have_perl=yes], [have_perl=no])
+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'])