mhstore: Made -auto the default.

[mmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 466a9dd..04f23d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,6 @@ esac
 AC_SUBST(OURDEFS)
 
 AC_HEADER_STDC
-AC_HEADER_TIME
 AC_HEADER_TIOCGWINSZ
 AC_CHECK_HEADERS(fcntl.h crypt.h termcap.h \
                  langinfo.h wchar.h wctype.h iconv.h \
@@ -360,7 +359,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS(lstat tzset getutent nl_langinfo mbtowc wcwidth)
+AC_CHECK_FUNCS(lstat nl_langinfo mbtowc wcwidth)
 
 dnl Look for the initgroups() declaration.  On AIX 4.[13], Solaris 4.1.3, and
 dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in
@@ -388,13 +387,19 @@ dnl Check location of modf
 AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
 
 dnl Checks for network libraries (nsl, socket)
-AC_CHECK_NETLIBS
+NMH_CHECK_NETLIBS
 
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
   AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
 done
 AC_SUBST(TERMLIB)dnl
+if test "x$TERMLIB" = "x"; then
+       echo 'Could not find tgetent() in any library.'
+       echo 'Is there a ncurses-devel package that you can install?'
+       exit 1
+fi
+
 
 dnl ---------------
 dnl CHECK FOR ICONV
@@ -534,19 +539,10 @@ dnl ----------------
 dnl CHECK STRUCTURES
 dnl ----------------
 
-AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
-  [#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif])
-
-AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include <utmp.h>])
+dnl For platforms such as FreeBSD that have tm_gmtoff in struct tm.
+dnl (FreeBSD has a timezone() function but not a timezone global
+dnl variable that is visible).
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
 
 AC_STRUCT_DIRENT_D_TYPE
 
@@ -568,34 +564,6 @@ nmh_cv_path_signal_h=$SIGNAL_H
 SIGNAL_H=$nmh_cv_path_signal_h
 AC_SUBST(SIGNAL_H)dnl
 
-dnl ----------------
-dnl OS SPECIFIC DEFINES
-dnl ----------------
-AH_TEMPLATE(BSD42, [Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody -- does PicoBSD have uname?])
-AH_TEMPLATE(SCO_5_STDIO, [Defined for SCO5.])
-
-case "$target_os" in
-
-  sunos4*)
-    AC_DEFINE(BSD42)
-    ;;
-  freebsd*)
-    AC_DEFINE(BSD42)
-    ;;
-  netbsd*)
-    AC_DEFINE(BSD42)
-    ;;
-  openbsd*)
-    AC_DEFINE(BSD42)
-    ;;
-  bsd/os*)
-    AC_DEFINE(BSD42)
-    ;;
-  sco5*)
-    AC_DEFINE(SCO_5_STDIO)
-    ;;
-esac
-
 
 dnl ----------------
 dnl OUTPUT MAKEFILES