blob: 11652f88e7024120a0aa97333116d83194095e20 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Add fallback tests for cross-compile
http://bugs.gentoo.org/120567
http://bugzilla.mindrot.org/show_bug.cgi?id=1145
--- openssh/configure.ac
+++ openssh/configure.ac
@@ -1366,6 +1366,9 @@
[
AC_MSG_RESULT(no)
AC_DEFINE(SSHD_ACQUIRES_CTTY)
+ ],
+ [
+ AC_MSG_WARN([cross compiling: Assuming yes])
]
)
fi
@@ -2959,13 +2964,12 @@
[ etc_default_login=yes ]
)
-if test "x$etc_default_login" != "xno"; then
+if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes"; then
+ AC_MSG_WARN([cross compiling: Disabling /etc/default/login test])
+elif test "x$etc_default_login" != "xno"; then
AC_CHECK_FILE("/etc/default/login",
[ external_path_file=/etc/default/login ])
- if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes";
- then
- AC_MSG_WARN([cross compiling: Disabling /etc/default/login test])
- elif test "x$external_path_file" = "x/etc/default/login"; then
+ if test "x$external_path_file" = "x/etc/default/login"; then
AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
fi
fi
|