Curses detection. Swap library link order in sieve to make sure dependacies are…

… caught right.  Add errno.h to mailutils/Makefile.am for make release

+2002-02-21  Jeff Bailey  <jbailey@outpost.dnsalias.org>
+
+	* sieve/Makefile.am: Link @ARGPLIBS@ before libmailutils.la to 
+	compensate for lack of interlibrary dependancies
+
+	* configure.in: Detect either curses or ncurses
+
+	* include/mailutils/Makefile.am: Add errno.h
+
 2002-02-20 20:25  Sam Roberts <sroberts@uniserve.com>
 2002-02-20 20:25  Sam Roberts <sroberts@uniserve.com>
 
 
 	* comsat/action.c, comsat/cfg.c, lib/argcv.c, lib/argcv.h,
 	* comsat/action.c, comsat/cfg.c, lib/argcv.c, lib/argcv.h,

@@ -270,19 +270,37 @@ AC_CHECK_FUNC(gethostbyname, [true],
 AC_CHECK_FUNC(socket, [true],
 AC_CHECK_FUNC(socket, [true],
 	AC_CHECK_LIB(socket, socket, LIBS="-lsocket $LIBS"))
 	AC_CHECK_LIB(socket, socket, LIBS="-lsocket $LIBS"))
 
 
+dnl Check for Curses libs.
+AC_CHECK_LIB(ncurses, tputs, CURSES_LIBS="-lncurses",
+	AC_CHECK_LIB(curses, tputs, CURSES_LIBS="-lcurses"))
+
+AC_SUBST(CURSES_LIBS)
+
 dnl Check for GNU Readline
 dnl Check for GNU Readline
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(READLINE_LIBS)
+
 if test x"$usereadline" = x"yes"; then
 if test x"$usereadline" = x"yes"; then
-	AC_CHECK_LIB(readline, readline,
-		      [AC_CHECK_HEADERS(readline/readline.h,
+
+	dnl FIXME This should only link in the curses libraries if it's
+	dnl really needed!
+	
+	saved_LIBS=$LIBS
+	LIBS="$LIBS $CURSES_LIBS"
+	AC_CHECK_LIB(readline, readline, mu_have_readline=yes)
+	LIBS=$saved_LIBS
+	
+	if test x"$mu_have_readline" = x"yes"; then
+		AC_CHECK_HEADERS(readline/readline.h,
 			AC_DEFINE(WITH_READLINE))
 			AC_DEFINE(WITH_READLINE))
-                       READLINE_LIBS="-lcurses -lreadline"
+			READLINE_LIBS="-lreadline $CURSES_LIBS"
 			saved_LIBS=$LIBS
 			saved_LIBS=$LIBS
 			LIBS="$LIBS $READLINE_LIBS"
 			LIBS="$LIBS $READLINE_LIBS"
 			AC_CHECK_FUNCS(rl_completion_matches)
 			AC_CHECK_FUNCS(rl_completion_matches)
-                       LIBS=$saved_LIBS],
-			:,
-		       -lcurses)
+			LIBS=$saved_LIBS
+	else
+		AC_MSG_WARN(readline requested but does not seem to be installed)
+	fi
+
 fi
 fi
 
 
 dnl Check for DBM
 dnl Check for DBM

@@ -5,6 +5,7 @@ pkginclude_HEADERS = \
  body.h \
  body.h \
  debug.h \
  debug.h \
  envelope.h \
  envelope.h \
+ errno.h \
  error.h \
  error.h \
  filter.h \
  filter.h \
  folder.h \
  folder.h \

@@ -54,7 +54,7 @@ HDR = \
   tree.h \
   tree.h \
   util.h
   util.h
 
 
-sieve_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @ARGPLIBS@
+sieve_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la
 sieve_SOURCES = \
 sieve_SOURCES = \
   sieve.c \
   sieve.c \
   ${SRC} $(HDR)
   ${SRC} $(HDR)