remove unused defines in uip/pick.c

[mmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2cda6e0..ad45c15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl ---------------------
 dnl define a macro or two
 dnl ---------------------
 
-AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+AC_DEFUN([NMH_PROG_GNU_LIBTOOL], [
 if test -n "$LIBTOOL" ; then
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
@@ -68,6 +68,19 @@ else
   AC_DEFINE(DOT_LOCKING)dnl
 fi
 
+dnl Should we use a locking directory?
+AC_ARG_WITH(lockdir,
+  AS_HELP_STRING([--with-lockdir=dir], [Store dot-lock files in "dir"]), [
+    AS_IF([test "x$with_lockdir" = xyes],[
+      AC_MSG_ERROR([--with-lockdir requires an argument])])
+])
+
+if test x"$with_lockdir" != x; then
+  LOCKDIR="$with_lockdir"
+  AC_DEFINE_UNQUOTED(LOCKDIR, ["$with_lockdir"],
+                     [Directory to store dot-locking lock files.])dnl
+fi
+
 
 dnl ----------------------------------------------------
 dnl Default location is /usr/local/mmh/{bin,etc,lib,share/man}
@@ -364,10 +377,7 @@ dnl -------------------
 dnl Check location of modf
 AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
 
-dnl Checks for network libraries (nsl, socket)
-NMH_CHECK_NETLIBS
-
-termcap_curses_order="termcap curses ncurses"
+termcap_curses_order="termcap curses ncurses tinfo"
 for lib in $termcap_curses_order; do
   AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
 done
@@ -547,7 +557,7 @@ dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
-                etc/Makefile docs/Makefile man/Makefile)
+                etc/Makefile man/Makefile)
 AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
 AC_OUTPUT
 
@@ -563,7 +573,7 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhlib=${libdir}";         eval "nmhlib=${nmhlib}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 
-echo "
+cat <<!
 mmh configuration
 -----------------
 mmh version            : AC_PACKAGE_VERSION
@@ -583,4 +593,7 @@ sendmail path          : ${sendmailpath}
 mail spool             : ${mailspool}
 
 file locking type      : ${LOCKTYPE}
-"
+!
+if test x"$LOCKTYPE" = x"dot" && test x"$LOCKDIR" != x; then
+       echo "lockfile directory     : ${LOCKDIR}"
+fi