--- a/configure.in	Wed Oct 31 11:44:53 2001 +0000
+++ b/configure.in	Tue Nov 06 21:22:19 2001 +0000
@@ -7,7 +7,7 @@
 AC_PREREQ(2.13)
 
 PACKAGE=noffle
-VERSION=1.1-unstable-develop
+VERSION=1.1.1-unstable-develop
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
@@ -141,8 +141,8 @@
 
 # [ This is adapted from mutt. ]
 AC_ARG_WITH(docdir,
-[  --with-docdir=PATH      specify where to put the documentation
-], [noffle_cv_docdir=$withval],
+[  --with-docdir=PATH      specify where to put the documentation],
+[noffle_cv_docdir=$withval],
 [ AC_CACHE_CHECK(where to put the documentation, noffle_cv_docdir,
   [if test x$prefix = xNONE; then
     noffle_cv_prefix=$ac_default_prefix
@@ -153,15 +153,42 @@
   ])
 ])
 
+dnl check where to put the spooldir - taken from leafnode 2.0beta.
+AC_MSG_CHECKING(spooldir)
+AC_ARG_WITH(spooldir,
+[  --with-spooldir=PATH    news spool directory (/var/spool/noffle)],
+  if echo "$withval" | egrep >/dev/null -v '^/' ; then
+    AC_MSG_ERROR(you must give an absolute path)
+  fi
+  withval=`echo "$withval" | sed 'sx/*$xx;'`
+,
+  withval="/var/spool/$PACKAGE"
+)
+SPOOLDIR=$withval
+AC_MSG_RESULT($SPOOLDIR)
+AC_DEFINE_UNQUOTED(SPOOLDIR, "$SPOOLDIR")
+AC_SUBST(SPOOLDIR)
+
+dnl check where to put the config file
+AC_MSG_CHECKING(configfile)
+AC_ARG_WITH(configfile,
+[  --with-configfile=PATH   configuration file (/etc/noffle.conf)],
+  if echo "$withval" | egrep >/dev/null -v '^/' ; then
+    AC_MSG_ERROR(you must give an absolute path)
+  fi
+  withval=`echo "$withval" | sed 'sx/*$xx;'`
+,
+  withval="/etc/$PACKAGE.conf"
+)
+CONFIGFILE=$withval
+AC_MSG_RESULT($CONFIGFILE)
+AC_DEFINE_UNQUOTED(CONFIGFILE,"$CONFIGFILE")
+AC_SUBST(CONFIGFILE)
 
 dnl ---------------------------------------------------------------------------
 dnl Unquoted defines and substituted variables.
 dnl ---------------------------------------------------------------------------
 
-CONFIGFILE="/etc/noffle.conf"
-AC_DEFINE_UNQUOTED(CONFIGFILE,"$CONFIGFILE")
-AC_SUBST(CONFIGFILE)
-
 dnl NOFFLE_EXPAND_DIR(VARNAME, DIR)
 dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
 dnl and assigns the resulting string to VARNAME
@@ -178,10 +205,6 @@
  )`
 ])
 
-SPOOLDIR="/var/spool/$PACKAGE"
-AC_DEFINE_UNQUOTED(SPOOLDIR, "$SPOOLDIR")
-AC_SUBST(SPOOLDIR)
-
 DOCDIR=$noffle_cv_docdir
 AC_SUBST(DOCDIR)