View | Details | Raw Unified | Return to bug 321 | Differences between
and this patch

Collapse All | Expand All

(-)../../openssh-3.7p1/configure.ac (-13 / +52 lines)
Lines 450-456 Link Here
450
	[
450
	[
451
		AC_MSG_RESULT(no)
451
		AC_MSG_RESULT(no)
452
		AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
452
		AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
453
	]
453
	],
454
	[	AC_MSG_WARN([cross compiling: not checking compiler sanity]) ]
454
)
455
)
455
456
456
# Checks for header files.
457
# Checks for header files.
Lines 620-625 Link Here
620
	[
621
	[
621
		AC_MSG_RESULT(no)
622
		AC_MSG_RESULT(no)
622
		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
623
		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
624
	],
625
	[ 
626
		AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME])
627
		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
623
	]
628
	]
624
)
629
)
625
630
Lines 771-776 Link Here
771
			AC_MSG_RESULT(no)
776
			AC_MSG_RESULT(no)
772
			AC_DEFINE(BROKEN_SNPRINTF)
777
			AC_DEFINE(BROKEN_SNPRINTF)
773
			AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
778
			AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
779
		],
780
		[
781
			AC_MSG_WARN([cross compiling: Assuming working snprintf()])
774
		]
782
		]
775
	)
783
	)
776
fi
784
fi
Lines 979-984 Link Here
979
	[
987
	[
980
		AC_MSG_RESULT(not found)
988
		AC_MSG_RESULT(not found)
981
		AC_MSG_ERROR(OpenSSL version header not found.)
989
		AC_MSG_ERROR(OpenSSL version header not found.)
990
	],
991
	[
992
		AC_MSG_WARN([cross compiling: not checking])
982
	]
993
	]
983
)
994
)
984
995
Lines 1012-1017 Link Here
1012
	[
1023
	[
1013
		AC_MSG_RESULT(not found)
1024
		AC_MSG_RESULT(not found)
1014
		AC_MSG_ERROR(OpenSSL library not found.)
1025
		AC_MSG_ERROR(OpenSSL library not found.)
1026
	],
1027
	[
1028
		AC_MSG_WARN([cross compiling: not checking])
1015
	]
1029
	]
1016
)
1030
)
1017
1031
Lines 1031-1036 Link Here
1031
		AC_MSG_ERROR([Your OpenSSL headers do not match your library.
1045
		AC_MSG_ERROR([Your OpenSSL headers do not match your library.
1032
Check config.log for details.
1046
Check config.log for details.
1033
Also see contrib/findssl.sh for help identifying header/library mismatches.])
1047
Also see contrib/findssl.sh for help identifying header/library mismatches.])
1048
	],
1049
	[
1050
		AC_MSG_WARN([cross compiling: not checking])
1034
	]
1051
	]
1035
)
1052
)
1036
1053
Lines 1060-1065 Link Here
1060
		# Default to use of the rand helper if OpenSSL doesn't
1077
		# Default to use of the rand helper if OpenSSL doesn't
1061
		# seed itself
1078
		# seed itself
1062
		USE_RAND_HELPER=yes
1079
		USE_RAND_HELPER=yes
1080
	],
1081
	[
1082
		AC_MSG_WARN([cross compiling: assuming yes])
1083
		# This is safe, since all recent OpenSSL versions will
1084
		# complain at runtime if not seeded correctly. 
1085
		OPENSSL_SEEDS_ITSELF=yes
1063
	]
1086
	]
1064
)
1087
)
1065
1088
Lines 1650-1656 Link Here
1650
#else
1673
#else
1651
main() { exit(0); }
1674
main() { exit(0); }
1652
#endif
1675
#endif
1653
		], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]
1676
		], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
1677
		AC_MSG_WARN([cross compiling: Assuming working snprintf()])
1654
	)
1678
	)
1655
fi
1679
fi
1656
1680
Lines 1755-1767 Link Here
1755
dnl make sure we're using the real structure members and not defines
1779
dnl make sure we're using the real structure members and not defines
1756
AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
1780
AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
1757
		ac_cv_have_accrights_in_msghdr, [
1781
		ac_cv_have_accrights_in_msghdr, [
1758
	AC_TRY_RUN(
1782
	AC_TRY_COMPILE(
1759
		[
1783
		[
1760
#include <sys/types.h>
1784
#include <sys/types.h>
1761
#include <sys/socket.h>
1785
#include <sys/socket.h>
1762
#include <sys/uio.h>
1786
#include <sys/uio.h>
1763
int main() {
1787
int main() {
1764
#ifdef msg_accrights
1788
#ifdef msg_accrights
1789
#error "msg_accrights is a macro"
1765
exit(1);
1790
exit(1);
1766
#endif
1791
#endif
1767
struct msghdr m;
1792
struct msghdr m;
Lines 1779-1791 Link Here
1779
1804
1780
AC_CACHE_CHECK([for msg_control field in struct msghdr],
1805
AC_CACHE_CHECK([for msg_control field in struct msghdr],
1781
		ac_cv_have_control_in_msghdr, [
1806
		ac_cv_have_control_in_msghdr, [
1782
	AC_TRY_RUN(
1807
	AC_TRY_COMPILE(
1783
		[
1808
		[
1784
#include <sys/types.h>
1809
#include <sys/types.h>
1785
#include <sys/socket.h>
1810
#include <sys/socket.h>
1786
#include <sys/uio.h>
1811
#include <sys/uio.h>
1787
int main() {
1812
int main() {
1788
#ifdef msg_control
1813
#ifdef msg_control
1814
#error "msg_control is a macro"
1789
exit(1);
1815
exit(1);
1790
#endif
1816
#endif
1791
struct msghdr m;
1817
struct msghdr m;
Lines 2073-2078 Link Here
2073
	AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir")
2099
	AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir")
2074
fi
2100
fi
2075
2101
2102
if test "$cross_compiling"; then
2103
	echo cross compiling: Disabling /dev/ptmx test
2104
	disable_ptmx_check=yes
2105
fi
2076
if test -z "$no_dev_ptmx" ; then
2106
if test -z "$no_dev_ptmx" ; then
2077
	if test "x$disable_ptmx_check" != "xyes" ; then
2107
	if test "x$disable_ptmx_check" != "xyes" ; then
2078
		AC_CHECK_FILE("/dev/ptmx", 
2108
		AC_CHECK_FILE("/dev/ptmx", 
Lines 2083-2095 Link Here
2083
		)
2113
		)
2084
	fi
2114
	fi
2085
fi
2115
fi
2086
AC_CHECK_FILE("/dev/ptc", 
2087
	[
2088
		AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
2089
		have_dev_ptc=1
2090
	]
2091
)
2092
2116
2117
if test "$cross_compiling"; then
2118
	echo cross compiling: Disabling /dev/ptc test
2119
else
2120
	AC_CHECK_FILE("/dev/ptc", 
2121
		[
2122
			AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
2123
			have_dev_ptc=1
2124
		]
2125
	)
2126
fi
2127
	
2093
# Options from here on. Some of these are preset by platform above
2128
# Options from here on. Some of these are preset by platform above
2094
AC_ARG_WITH(mantype,
2129
AC_ARG_WITH(mantype,
2095
	[  --with-mantype=man|cat|doc  Set man page type],
2130
	[  --with-mantype=man|cat|doc  Set man page type],
Lines 2182-2190 Link Here
2182
	)
2217
	)
2183
fi
2218
fi
2184
2219
2185
# check for /etc/default/login and use it if present.
2220
if test "$cross_compiling"; then
2186
AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
2221
	echo cross compiling: Disabling /etc/default/login test
2187
2222
else
2223
	# check for /etc/default/login and use it if present.
2224
	AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
2225
fi
2226
	
2188
if test "x$external_path_file" = "x/etc/default/login"; then
2227
if test "x$external_path_file" = "x/etc/default/login"; then
2189
	AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
2228
	AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
2190
fi
2229
fi

Return to bug 321