Files
pkgsrc-ng/security/openssh/patches/patch-configure.ac
2014-11-05 12:41:07 +01:00

70 lines
2.0 KiB
Plaintext

$NetBSD: patch-configure.ac,v 1.3 2014/03/29 09:38:11 taca Exp $
Various fixes regarding portability
--- configure.ac.orig 2014-02-21 17:09:34.000000000 +0000
+++ configure.ac
@@ -275,6 +275,9 @@ AC_ARG_WITH([rpath],
]
)
+# pkgsrc handles any rpath settings this package needs
+need_dash_r=
+
# Allow user to specify flags
AC_ARG_WITH([cflags],
[ --with-cflags Specify additional flags to pass to compiler],
@@ -346,6 +349,7 @@ AC_CHECK_HEADERS([ \
maillock.h \
ndir.h \
net/if_tun.h \
+ net/tun/if_tun.h \
netdb.h \
netgroup.h \
pam/pam_appl.h \
@@ -655,6 +659,15 @@ main() { if (NSVersionOfRunTimeLibrary("
;;
esac
;;
+*-*-interix*)
+ AC_DEFINE(HAVE_INTERIX)
+ AC_DEFINE(DISABLE_FD_PASSING)
+ AC_DEFINE(DISABLE_SHADOW)
+ AC_DEFINE(IP_TOS_IS_BROKEN)
+ AC_DEFINE(MISSING_HOWMANY)
+ AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
+ AC_DEFINE(USE_PIPES)
+ ;;
*-*-irix5*)
PATH="$PATH:/usr/etc"
AC_DEFINE([BROKEN_INET_NTOA], [1],
@@ -4731,9 +4744,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
])
if test -z "$conf_wtmpx_location"; then
if test x"$system_wtmpx_path" = x"no" ; then
- AC_DEFINE([DISABLE_WTMPX])
+ for f in /var/log/wtmpx; do
+ if test -f $f ; then
+ conf_wtmpx_location=$f
+ fi
+ done
+ if test -z "$conf_wtmpx_location"; then
+ AC_DEFINE(DISABLE_WTMPX)
+ fi
fi
-else
+fi
+if test -n "$conf_wtmpx_location"; then
AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"],
[Define if you want to specify the path to your wtmpx file])
fi
@@ -4820,7 +4841,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"
-echo " Askpass program: $E"
+echo " Askpass program: ${ASKPASS_PROGRAM}"
echo " Manual pages: $F"
echo " PID file: $G"
echo " Privilege separation chroot path: $H"