- (djm) Added WARNING.RNG file and modified configure to ask users of the

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 7cd7467f9f5725569088ccb37421658f6a8a83a4..90e75bef4482e06a80e60f620b81b8020d129d6f 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
@@ -119,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
        ;;
@@ -257,7 +266,14 @@ AC_ARG_WITH(libs,
 # Checks for libraries.
 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_LIB(rx, regcomp, AC_DEFINE(HAVE_LIBRX) LIBS="$LIBS -lrx")
+
+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, , )
@@ -490,6 +506,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)
@@ -1516,6 +1537,7 @@ else
                RAND_MSG="EGD ($EGD_SOCKET)"
        else
                RAND_MSG="Builtin (timeout $entropy_timeout)"
+               BUILTIN_RNG=1
        fi
 fi
 
@@ -1559,3 +1581,9 @@ 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