20001110

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index a038c959477c874e0b54791f3057a3a1a197c8eb..be500da201462db05cb2a22e1c7b9d6d5cf33c2d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,7 @@ case "$host" in
        mansubdir=cat
        ;;
 *-*-cygwin*)
-       LIBS="$LIBS /usr/lib/textmode.o"
+       LIBS="$LIBS -lregex /usr/lib/textmode.o"
        AC_DEFINE(HAVE_CYGWIN)
        AC_DEFINE(DISABLE_PAM)
        AC_DEFINE(DISABLE_SHADOW)
@@ -78,6 +78,7 @@ case "$host" in
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
+       AC_DEFINE(SPT_TYPE,SPT_PSTAT)
        LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
@@ -88,6 +89,7 @@ case "$host" in
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
+       AC_DEFINE(SPT_TYPE,SPT_PSTAT)
        LIBS="$LIBS -lsec"
        MANTYPE='$(CATMAN)'
        mansubdir=cat
@@ -95,6 +97,7 @@ case "$host" in
 *-*-irix5*)
        CFLAGS="$CFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
+       PATH="$PATH:/usr/etc"
        MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
@@ -103,6 +106,7 @@ case "$host" in
 *-*-irix6*)
        CFLAGS="$CFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
+       PATH="$PATH:/usr/etc"
        MANTYPE='$(CATMAN)'
        AC_DEFINE(WITH_IRIX_ARRAY)
        AC_DEFINE(WITH_IRIX_PROJECT)
@@ -117,6 +121,13 @@ case "$host" in
        AC_DEFINE(PAM_TTY_KLUDGE)
        inet6_default_4in6=yes
        ;;
+mips-sony-bsd|mips-sony-newsos4)
+       AC_DEFINE(HAVE_NEWS4)
+       SONY=1
+       AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
+               AC_MSG_ERROR([*** libiberty missing - please install first ***])
+        )
+       ;;
 *-*-netbsd*)
        need_dash_r=1
        ;;
@@ -126,6 +137,8 @@ case "$host" in
        conf_wtmp_location=/usr/adm/wtmp
        MAIL=/usr/spool/mail
        AC_DEFINE(HAVE_NEXT)
+       AC_DEFINE(BROKEN_REALPATH)
+       AC_DEFINE(USE_PIPES)
        CFLAGS="$CFLAGS -I/usr/local/include"
        ;;
 *-*-solaris*)
@@ -234,7 +247,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"
@@ -255,6 +268,14 @@ AC_ARG_WITH(libs,
 AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
 AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
 
+AC_CHECK_FUNC(regcomp, 
+       [],
+       [
+               AC_CHECK_LIB(pcre, pcre_info, 
+                       AC_DEFINE(HAVE_LIBPCRE) LIBS="$LIBS -lpcreposix -lpcre")
+       ]
+)
+
 if test -z "$no_libsocket" ; then
        AC_CHECK_LIB(nsl, yp_match, , )
 fi
@@ -263,10 +284,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)
+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)
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid setrlimit sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup _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
@@ -359,7 +380,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
        ]
@@ -486,6 +507,11 @@ else
        fi
 fi
 
+# Cheap hack to ensure NEWS-OS libraries are arranged right.
+if test ! -z "$SONY" ; then
+  LIBS="$LIBS -liberty";
+fi
+
 # Checks for data types
 AC_CHECK_SIZEOF(char, 1)
 AC_CHECK_SIZEOF(short int, 2)
@@ -827,10 +853,9 @@ AC_CACHE_CHECK([for pw_class field in struct passwd],
                ac_cv_have_pw_class_in_struct_passwd, [
        AC_TRY_COMPILE(
                [
-#include <sys/types.h>
 #include <pwd.h>
                ],
-               [ struct passwd p s; p.pw_class = NULL; ],
+               [ struct passwd p; p.pw_class = 0; ],
                [ ac_cv_have_pw_class_in_struct_passwd="yes" ],
                [ ac_cv_have_pw_class_in_struct_passwd="no" ]
        )
@@ -892,7 +917,7 @@ AC_ARG_WITH(rsh,
 AC_ARG_WITH(xauth,
        [  --with-xauth=PATH       Specify path to xauth program ],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        xauth_path=$withval
                fi
        ],
@@ -1018,7 +1043,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
@@ -1058,9 +1083,9 @@ AC_ARG_WITH(afs,
        [
                if test "x$withval" != "xno" ; then
 
-                       if test "x$withval" != "$xyes" ; then
+                       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
@@ -1081,12 +1106,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
        ]
 )
@@ -1184,7 +1221,7 @@ AC_ARG_WITH(default-path,
        [  --with-default-path=PATH Specify default \$PATH environment for server],
        [
                if test "x$withval" != "xno" ; then     
-                       user_path="$withval"
+                       AC_DEFINE_UNQUOTED(USER_PATH, "$withval")
                        SERVER_PATH_MSG="$withval" 
                fi
        ]
@@ -1513,6 +1550,7 @@ else
                RAND_MSG="EGD ($EGD_SOCKET)"
        else
                RAND_MSG="Builtin (timeout $entropy_timeout)"
+               BUILTIN_RNG=1
        fi
 fi
 
@@ -1521,13 +1559,14 @@ A=`eval echo ${prefix}` ; A=`eval echo ${A}`
 B=`eval echo ${bindir}` ; B=`eval echo ${B}`
 C=`eval echo ${sbindir}` ; C=`eval echo ${C}`
 D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
-E=`eval echo ${libexecdir}/ssh/ssh-askpass` ; E=`eval echo ${E}`
+E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}`
 F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
 G=`eval echo ${piddir}` ; G=`eval echo ${G}`
 
 echo ""
 echo "OpenSSH configured has been configured with the following options."
 echo "                 User binaries: $B"
+echo "                 User binaries: $B"
 echo "               System binaries: $C"
 echo "           Configuration files: $D"
 echo "               Askpass program: $E"
@@ -1547,9 +1586,17 @@ echo "       Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 
 echo ""
 
-echo "Compiler flags: ${CFLAGS}"
-echo "Linker flags: ${LDFLAGS}"
-echo "Libraries: ${LIBS}"
+echo "             Host: ${host}"
+echo "         Compiler: ${CC}"
+echo "   Compiler flags: ${CFLAGS}"
+echo "     Linker flags: ${LDFLAGS}"
+echo "        Libraries: ${LIBS}"
 
 echo ""
 
+if test ! -z "$BUILTIN_RNG" ; then
+       echo "WARNING: you are using the builtin random number collection service."
+       echo "Please read WARNING.RNG and request that your OS vendor includes"
+       echo "/dev/random in future versions of their OS."
+       echo ""
+fi