- markus@cvs.openbsd.org 2001/04/22 23:58:36

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 081df2971eaf12a41b4deb4ce466420aec70d303..8cf096b82b0e88eafdb8a130d6b4e75414ff26da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(PERL, perl)
+AC_PATH_PROGS(PERL, perl5 perl)
 AC_SUBST(PERL)
 AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)
@@ -58,12 +58,8 @@ case "$host" in
        fi
        AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
        AC_DEFINE(BROKEN_GETADDRINFO)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        dnl AIX handles lastlog as part of its login message
        AC_DEFINE(DISABLE_LASTLOG)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-*-cygwin*)
        LIBS="$LIBS -lregex /usr/lib/textmode.o"
@@ -89,8 +85,6 @@ case "$host" in
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
        LIBS="$LIBS -lsec"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-*-hpux11*)
        CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
@@ -101,14 +95,11 @@ case "$host" in
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
        LIBS="$LIBS -lsec"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-*-irix5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
-       MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(BROKEN_INET_NTOA)
@@ -117,7 +108,6 @@ case "$host" in
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
-       MANTYPE='$(CATMAN)'
        AC_DEFINE(WITH_IRIX_ARRAY)
        AC_DEFINE(WITH_IRIX_PROJECT)
        AC_DEFINE(WITH_IRIX_AUDIT)
@@ -125,7 +115,6 @@ case "$host" in
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(BROKEN_INET_NTOA)
-       mansubdir=man
        ;;
 *-*-linux*)
        no_dev_ptmx=1
@@ -185,56 +174,42 @@ mips-sony-bsd|mips-sony-newsos4)
        conf_wtmp_location=/var/adm/wtmp
        conf_lastlog_location=/var/adm/lastlog
        AC_DEFINE(USE_PIPES)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-ncr-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        LIBS="$LIBS -lc89 -lnsl -lgen -lsocket"
        ;;
 *-sni-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
-       MANTYPE='$(CATMAN)'
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
-       mansubdir=cat
        LIBS="$LIBS -lgen -lnsl -lucb"
        ;;
 *-*-sysv4.2*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        LIBS="$LIBS -lgen -lsocket"
        ;;
 *-*-sco3.2v4*)
        CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
        LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
-       mansubdir=cat
        rsh_path="/usr/bin/rcmd"
        RANLIB=true
        no_dev_ptmx=1
@@ -250,8 +225,6 @@ mips-sony-bsd|mips-sony-newsos4)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        LIBS="$LIBS -lprot -lx -ltinfo -lm"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        no_dev_ptmx=1
        rsh_path="/usr/bin/rcmd"
        AC_DEFINE(USE_PIPES)
@@ -471,7 +444,7 @@ AC_ARG_WITH(tcp-wrappers,
 )
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
 dnl    Checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
 dnl    Checks for libutil functions
@@ -1426,22 +1399,34 @@ AC_SUBST(INSTALL_SSH_PRNG_CMDS)
 
 
 AC_ARG_WITH(catman,
-       [  --with-catman=man|cat   Install preformatted manpages[no]],
+       [  --with-mantype=man|cat|doc  Set man page type],
        [
-               MANTYPE='$(CATMAN)'
-               if test x"$withval" != x"yes" ; then
-                  mansubdir=$withval
-               else
-                  mansubdir=cat
-               fi
-       ], [
-               if test -z "$MANTYPE" ; then
-                       MANTYPE='$(TROFFMAN)'
-                       mansubdir=man
-               fi
+               case "$withval" in
+               man|cat|doc)
+                       MANTYPE=$withval
+                       ;;
+               *)
+                       AC_MSG_ERROR(invalid man type: $withval)
+                       ;;
+               esac
        ]
 )
+if test -z "$MANTYPE"; then
+       AC_PATH_PROGS(NROFF, nroff awf, /bin/false)
+       if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
+               MANTYPE=doc
+       elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
+               MANTYPE=man
+       else
+               MANTYPE=cat
+       fi
+fi
 AC_SUBST(MANTYPE)
+if test "$MANTYPE" = "doc"; then
+       mansubdir=man;
+else
+       mansubdir=$MANTYPE;
+fi
 AC_SUBST(mansubdir)
 
 # Check whether to enable MD5 passwords
@@ -1897,11 +1882,6 @@ AC_OUTPUT(Makefile openbsd-compat/Makefile ssh_prng_cmds)
 
 # Print summary of options
 
-if test x$MANTYPE = x'$(CATMAN)' ; then
-       MAN_MSG=cat
-else 
-       MAN_MSG=man
-fi
 if test ! -z "$RANDOM_POOL" ; then
        RAND_MSG="Device ($RANDOM_POOL)"
 else
@@ -1935,7 +1915,7 @@ echo "                  Manual pages: $F"
 echo "                      PID file: $G"
 echo "        sshd default user PATH: $H"
 echo "      Random number collection: $RAND_MSG"
-echo "                Manpage format: $MAN_MSG"
+echo "                Manpage format: $MANTYPE"
 echo "                   PAM support: ${PAM_MSG}"
 echo "            KerberosIV support: $KRB4_MSG"
 echo "                   AFS support: $AFS_MSG"