- (stevesk) OpenSSH CVS update:

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 5a30819b499853ad7f71776aad75f6d525c3306b..195359ae1dcbe322cee7d7d4628ca50a93a1e45a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,10 @@ AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)
 AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin)
 
+if test -z "$AR" ; then
+       AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])
+fi
+
 # Use LOGIN_PROGRAM from environment if possible
 if test ! -z "$LOGIN_PROGRAM" ; then
        AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM")
@@ -111,9 +115,11 @@ case "$host" in
        AC_DEFINE(WITH_IRIX_ARRAY)
        AC_DEFINE(WITH_IRIX_PROJECT)
        AC_DEFINE(WITH_IRIX_AUDIT)
+       AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)])
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(BROKEN_INET_NTOA)
+       mansubdir=man
        ;;
 *-*-linux*)
        no_dev_ptmx=1
@@ -204,22 +210,24 @@ mips-sony-bsd|mips-sony-newsos4)
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
-       LIBS="$LIBS -lgen -lsocket -los -lprot -lx"
+       LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
        RANLIB=true
        AC_DEFINE(BROKEN_SYS_TERMIO_H)
        rsh_path="/usr/bin/rcmd"
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
+       AC_DEFINE(DISABLE_SHADOW)
        ;;
 *-*-sco3.2v5*)
        CFLAGS="$CFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
-       LIBS="$LIBS -lgen -lsocket -lprot -lx"
+       LIBS="$LIBS -lgen -lsocket -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
        rsh_path="/usr/bin/rcmd"
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
+       AC_DEFINE(DISABLE_SHADOW)
        ;;
 *-dec-osf*)
 # This is untested
@@ -247,7 +255,7 @@ AC_ARG_WITH(cflags,
        ]       
 )
 AC_ARG_WITH(ldflags,
-       [  --with-ldlags           Specify additional flags to pass to linker],
+       [  --with-ldflags          Specify additional flags to pass to linker],
        [
                if test "x$withval" != "xno" ; then
                        LDFLAGS="$LDFLAGS $withval"
@@ -284,10 +292,10 @@ if test -z "$no_libnsl" ; then
 fi
 
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h vis.h)
+AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h vis.h)
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setenv seteuid setlogin setproctitle setreuid setrlimit sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup vis _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup vis waitpid _getpty __b64_ntop)
 dnl    Checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
 dnl    Checks for libutil functions
@@ -380,7 +388,7 @@ fi
 AC_ARG_WITH(ssl-dir,
        [  --with-ssl-dir=PATH     Specify path to OpenSSL installation ],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        tryssldir=$withval
                fi
        ]
@@ -929,8 +937,13 @@ AC_ARG_WITH(xauth,
        ]
 )
 
-if test ! -z "$xauth_path" ; then
+if test -z "$xauth_path" ; then
+       XAUTH_PATH="undefined"
+       AC_SUBST(XAUTH_PATH)
+else
        AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
+       XAUTH_PATH=$xauth_path
+       AC_SUBST(XAUTH_PATH)
 fi
 if test ! -z "$rsh_path" ; then
        AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")
@@ -1043,7 +1056,7 @@ AC_ARG_WITH(kerberos4,
        [
                if test "x$withval" != "xno" ; then
        
-                       if test "x$withval" != "$xyes" ; then
+                       if test "x$withval" != "xyes" ; then
                                CFLAGS="$CFLAGS -I${withval}/include"
                                LDFLAGS="$LDFLAGS -L${withval}/lib"
                                if test ! -z "$need_dash_r" ; then
@@ -1085,7 +1098,7 @@ AC_ARG_WITH(afs,
 
                        if test "x$withval" != "xyes" ; then
                                CFLAGS="$CFLAGS -I${withval}/include"
-                               LFLAGS="$LFLAGS -L${withval}/lib"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
                        fi
 
                        if test -z "$KRB4" ; then
@@ -1106,12 +1119,24 @@ LIBS="$LIBS $KLIBS"
 # Check whether user wants S/Key support
 SKEY_MSG="no" 
 AC_ARG_WITH(skey,
-       [  --with-skey             Enable S/Key support],
+       [  --with-skey=PATH         Enable S/Key support],
        [
                if test "x$withval" != "xno" ; then
+
+                       if test "x$withval" != "xyes" ; then
+                               CFLAGS="$CFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                       fi
+
                        AC_DEFINE(SKEY)
                        LIBS="$LIBS -lskey"
                        SKEY_MSG="yes" 
+       
+                       AC_CHECK_FUNC(skey_keyinfo,
+                               [],
+                               [
+                                       AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
+                               ])
                fi
        ]
 )