]> andersk Git - openssh.git/blobdiff - configure.in
- Prepare for 1.2.1pre20
[openssh.git] / configure.in
index b0dde23ee516206c63a2fee16d35c5ec734f0095..7bb96270a9c1a6388c3a5bf22a2a6e82a8ba0391 100644 (file)
@@ -1,6 +1,7 @@
 AC_INIT(ssh.c)
 
 AC_CONFIG_HEADER(config.h)
+AC_CANONICAL_HOST
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -8,8 +9,52 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_PROG(AR, ar, ar)
+AC_PATH_PROG(xauth_path, xauth)
+
+dnl Use ip address instead of hostname in $DISPLAY
+AC_ARG_WITH(rsh,
+       [  --with-rsh=PATH         Specify path to remote shell program ],
+       [
+               AC_DEFINE_UNQUOTED(RSH_PATH, "$withval")
+       ],
+       [
+               AC_PATH_PROG(rsh_path, rsh)
+       ]
+)
+
+if test ! -z "$xauth_path" ; then
+       AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
+fi
+if test ! -z "$rsh_path" ; then
+       AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")
+fi
+
+dnl Checks for compiler characteristics
 if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
 
+AC_C_INLINE
+
+dnl Check for some target-specific stuff
+case "$host" in
+*-*-hpux10*)
+       if test -z "$GCC"; then
+               CFLAGS="$CFLAGS -Aa"
+       fi
+       CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+       AC_DEFINE(IPADDR_IN_DISPLAY)
+       AC_DEFINE(USE_UTMPX)
+       AC_MSG_CHECKING(for HPUX trusted system password database)
+       if test -f /tcb/files/auth/system/default; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW)
+               LIBS="$LIBS -lsec"
+       else
+               AC_MSG_RESULT(no)
+               AC_DEFINE(DISABLE_SHADOW)
+       fi
+       ;;
+esac
+
 dnl Check for OpenSSL/SSLeay directories.
 AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
 for ssldir in /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do
@@ -31,7 +76,7 @@ AC_SUBST(ssldir)
 AC_DEFINE_UNQUOTED(ssldir, "$ssldir")
 if test "$ssldir" != "/usr"; then
        CFLAGS="$CFLAGS -I$ssldir/include"
-       LIBS="$LIBS -L$ssldir/lib"
+       LDFLAGS="$LDFLAGS -L$ssldir/lib"
 fi
 LIBS="$LIBS -lssl -lcrypto"
 AC_MSG_RESULT($ssldir)
@@ -51,15 +96,22 @@ AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
 AC_CHECK_LIB(nsl, yp_match, , )
 AC_CHECK_LIB(socket, main, , )
 
-dnl libdl is needed by PAM on Redhat systems
-AC_CHECK_LIB(dl, dlopen, , )
-AC_CHECK_LIB(pam, pam_authenticate, , )
+dnl Use ip address instead of hostname in $DISPLAY
+AC_ARG_WITH(pam,
+       [  --without-pam           Disable PAM support ],
+       [
+               if test "x$withval" != "xno" ; then
+                       AC_CHECK_LIB(dl, dlopen, , )
+                       AC_CHECK_LIB(pam, pam_authenticate, , )
+               fi
+       ]
+)
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h pty.h shadow.h util.h utmp.h sys/select.h sys/time.h)
+AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h poll.h pty.h shadow.h util.h utmp.h utmpx.h sys/bsdtty.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(arc4random mkdtemp openpty setenv setlogin setproctitle strlcat strlcpy)
+AC_CHECK_FUNCS(arc4random updwtmpx mkdtemp openpty _getpty innetgr setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy vsnprintf)
 
 AC_CHECK_FUNC(login, 
        [AC_DEFINE(HAVE_LOGIN)],
@@ -137,46 +189,23 @@ AC_TRY_COMPILE(
        ]
 ) 
 
-dnl Check whether use wants to disable the external ssh-askpass
-INSTALL_ASKPASS="yes"
-AC_MSG_CHECKING([whether to enable external ssh-askpass support])
-AC_ARG_WITH(askpass,
-       [  --with-askpass=yes/no   Enable external ssh-askpass support (default=yes)],
+AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
+dnl Check whether user wants GNOME ssh-askpass
+AC_ARG_WITH(gnome-askpass,
+       [  --with-gnome-askpass    Build the GNOME passphrase requester (default=no)],
        [
                if test x$withval = xno ; then
-                       INSTALL_ASKPASS="no"
+                       GNOME_ASKPASS="";
                else
-                       INSTALL_ASKPASS="yes"
+                       GNOME_ASKPASS="gnome-ssh-askpass";
                fi
-       ]
-)
-if test "x$INSTALL_ASKPASS" = "xyes" ; then
-       AC_DEFINE(USE_EXTERNAL_ASKPASS)
-       AC_SUBST(INSTALL_ASKPASS)
-       AC_MSG_RESULT(yes)
-else
-       AC_MSG_RESULT(no)
-fi
+       ])
+AC_SUBST(GNOME_ASKPASS)
 
-if test "x$INSTALL_ASKPASS" = "xyes" ; then
-       AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
-       dnl Check whether user wants GNOME ssh-askpass
-       AC_ARG_WITH(gnome-askpass,
-               [  --with-gnome-askpass    Build the GNOME passphrase requester (default=no)],
-               [
-                       if test x$withval = xno ; then
-                               GNOME_ASKPASS="";
-                       else
-                               GNOME_ASKPASS="gnome-ssh-askpass";
-                       fi
-               ])
-       AC_SUBST(GNOME_ASKPASS)
-
-       if test -z "$GNOME_ASKPASS" ; then
-               AC_MSG_RESULT(no)
-       else
-               AC_MSG_RESULT(yes)
-       fi
+if test -z "$GNOME_ASKPASS" ; then
+       AC_MSG_RESULT(no)
+else
+       AC_MSG_RESULT(yes)
 fi
 
 dnl Check for user-specified random device
@@ -214,35 +243,66 @@ if test -z "$RANDOM_POOL" -a -z "$EGD_POOL"; then
        AC_MSG_ERROR([No random device found, and no EGD random pool specified])
 fi
 
-dnl Check for ut_host field in utmp
 AC_MSG_CHECKING([whether utmp.h has ut_host field])
 AC_EGREP_HEADER(ut_host, utmp.h, 
        [AC_DEFINE(HAVE_HOST_IN_UTMP) AC_MSG_RESULT(yes); ], 
        [AC_MSG_RESULT(no)]
 )
+AC_MSG_CHECKING([whether utmpx.h has ut_host field])
+AC_EGREP_HEADER(ut_host, utmpx.h, 
+       [AC_DEFINE(HAVE_HOST_IN_UTMPX) AC_MSG_RESULT(yes); ], 
+       [AC_MSG_RESULT(no)]
+)
+AC_MSG_CHECKING([whether utmpx.h has syslen field])
+AC_EGREP_HEADER(syslen, utmpx.h, 
+       [AC_DEFINE(HAVE_SYSLEN_IN_UTMPX) AC_MSG_RESULT(yes); ], 
+       [AC_MSG_RESULT(no)]
+)
 
 dnl Look for lastlog location
-AC_MSG_CHECKING([location of lastlog file])
-for lastlog in /var/log/lastlog /var/adm/lastlog /etc/security/lastlog ; do
-       if test -f $lastlog ; then
-               gotlastlog="file"
-               break
-       fi
-       if test -d $lastlog ; then
-               gotlastlog="dir"
-               break
-       fi
-done
-if test -z "$gotlastlog" ; then
-       AC_MSG_ERROR([*** Cannot find lastlog ***])
-else
-       if test "x$gotlastlog" = "xdir" ; then
-               AC_DEFINE(LASTLOG_IS_DIR)
-               AC_MSG_ERROR([*** Directory-based lastlogs are not yet supported ***])
-       fi
-       AC_MSG_RESULT($lastlog)
-       AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$lastlog")
-fi     
+AC_ARG_WITH(lastlog,
+       [  --with-lastlog          Location of lastlog file],
+       [
+               if test "x$withval" = "xno" ; then
+                       AC_DEFINE(DISABLE_LASTLOG)
+               else
+                       AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$withval")
+               fi
+       ],
+       [
+               AC_MSG_CHECKING([location of lastlog file])
+               for lastlog in /var/log/lastlog /var/adm/lastlog /etc/security/lastlog ; do
+                       if test -f $lastlog ; then
+                               gotlastlog="file"
+                               break
+                       fi
+                       if test -d $lastlog ; then
+                               gotlastlog="dir"
+                               break
+                       fi
+               done
+               if test -z "$gotlastlog" ; then
+                       AC_MSG_WARN([*** Cannot find lastlog ***])
+                       nolastlog=1
+               else
+                       if test "x$gotlastlog" = "xdir" ; then
+                               AC_DEFINE(LASTLOG_IS_DIR)
+                               AC_MSG_WARN([*** Directory-based lastlogs are not yet supported ***])
+                               nolastlog=1
+                       fi
+                       AC_MSG_RESULT($lastlog)
+                       AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$lastlog")
+               fi      
+       ]
+)
+
+if test ! -z "$nolastlog" ; then
+       AC_MSG_WARN([*** Disabling lastlog support *** ])
+       AC_DEFINE(DISABLE_LASTLOG)
+fi
+
+AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX))
+AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC))
 
 AC_MSG_CHECKING([whether libc defines __progname])
 AC_TRY_LINK([], 
@@ -289,9 +349,10 @@ AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     Enable tcpwrappers support],
        [
                AC_DEFINE(LIBWRAP)
-               LIBS="$LIBS -lwrap"
+               LIBWRAP="-lwrap"
        ]
 )
+AC_SUBST(LIBWRAP)
 
 dnl Check whether to enable MD5 passwords
 AC_ARG_WITH(md5-passwords,
@@ -299,4 +360,40 @@ AC_ARG_WITH(md5-passwords,
        [AC_DEFINE(HAVE_MD5_PASSWORDS)]
 )
 
+dnl Check whether to enable utmpx support
+AC_ARG_WITH(utmpx,
+       [  --with-utmpx            Enable utmpx support],
+       [
+               if test "x$withval" != "xno" ; then
+                       AC_DEFINE(USE_UTMPX)
+               fi
+       ]
+)
+
+dnl Whether to disable shadow password support
+AC_ARG_WITH(shadow,
+       [  --without-shadow        Disable shadow password support],
+       [
+               if test "x$withval" = "xno" ; then      
+                       AC_DEFINE(DISABLE_SHADOW)
+               fi
+       ]
+)
+
+dnl Use ip address instead of hostname in $DISPLAY
+AC_ARG_WITH(ipaddr-display,
+       [  --with-ipaddr-display   Use ip address instead of hostname in \$DISPLAY],
+       [
+               if test "x$withval" = "xno" ; then      
+                       AC_DEFINE(IPADDR_IN_DISPLAY)
+               fi
+       ]
+)
+
+dnl Check for mail directory (last resort if we cannot get it from headers)
+if test ! -z "$MAIL" ; then
+       maildir=`dirname $MAIL`
+       AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir")
+fi
+
 AC_OUTPUT(Makefile)
This page took 0.051744 seconds and 4 git commands to generate.