X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=f4d1dd6543988d069194eb4c35a7256a1560971b;hb=f480c03187724e54e5391ee61b810827da319a6c;hp=274e08d2e2cda0bba22361aefdd2f266bc81d8a3;hpb=6c40d481d661d532dd527eaf34cebb6d3f8ed086;p=mmh

diff --git a/configure.ac b/configure.ac
index 274e08d..f4d1dd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,14 +78,6 @@ fi],
 AC_DEFINE(LOCALE)
 )
 
-dnl What should be the default editor?
-AC_ARG_WITH(editor,
-  AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
-
-if test -n "$with_editor"; then
-  editorpath="$with_editor"
-fi
-
 dnl What method of locking to use?
 AC_ARG_WITH(locking,
   AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
@@ -269,17 +261,6 @@ if test "$lspath" != "no"; then
   fi])
 fi
 
-dnl Look for `more'
-pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
-AC_PATH_PROG(morepath, more, no, [$pathtmp])
-
-dnl If pager is not specified yet,
-dnl then use `more' as the default.
-if test -z "$pagerpath"; then
-  pagerpath="$morepath"
-fi
-AC_SUBST(pagerpath)dnl
-
 dnl Look for `sendmail'
 pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
 AC_PATH_PROG(sendmailpath, sendmail, /usr/sbin/sendmail, [$pathtmp])
@@ -288,13 +269,6 @@ dnl Look for `vi'
 pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
 AC_PATH_PROG(vipath, vi, /bin/vi, [$pathtmp])
 
-dnl If editor is not specified yet,
-dnl then use `vi' as the default.
-if test -z "$editorpath"; then
-  editorpath="$vipath"
-fi
-AC_SUBST(editorpath)dnl
-
 dnl ----------------------------------------------------------
 dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
 dnl ----------------------------------------------------------
@@ -804,51 +778,27 @@ AC_SUBST(SIGNAL_H)dnl
 dnl ----------------
 dnl OS SPECIFIC DEFINES
 dnl ----------------
-AH_TEMPLATE(SYS5, [Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX, SCO5; only used in vmh.c which is not built.])
-AH_TEMPLATE(SVR4, [Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX; only used in vmh.c which is not built.])
-AH_TEMPLATE(BSD44, [Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody; only used in vmh.c which is not built.])
 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
 
-  solaris2*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  irix*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  osf*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
-  aix*)
-    AC_DEFINE(SYS5)
-    AC_DEFINE(SVR4)
-    ;;
   sunos4*)
     AC_DEFINE(BSD42)
     ;;
   freebsd*)  
     AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
     ;;
   netbsd*)
     AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
     ;;
   openbsd*)
     AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
     ;;
   bsd/os*)
     AC_DEFINE(BSD42)
-    AC_DEFINE(BSD44)
     ;;
   sco5*)
-    AC_DEFINE(SYS5)
     AC_DEFINE(SCO_5_STDIO)
     ;;
 esac
@@ -890,9 +840,7 @@ library install path   : ${nmhlib}
 config install path    : ${nmhsysconf}
 man page install path  : ${nmhman}
 
-default editor         : ${editorpath}
-default pager          : ${pagerpath}
-sendmail               : ${sendmailpath}
+sendmail path          : ${sendmailpath}
 
 file locking type      : ${LOCKTYPE}
 email address masq.    : ${masquerade}