Attachment 655 Details for Bug 321 – Patch to configure.ac (3.7p1)

[patch] Patch to configure.ac (3.7p1)

openssh-cross.patch (text/plain), 3.91 KB, created by Peter Ãstrand on 2004-06-22 20:45:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Ãstrand

Created: 2004-06-22 20:45:26 AEST

Size: 3.91 KB

patch

obsolete

>--- ../../openssh-3.7p1/configure.ac	Tue Sep 16 07:48:15 2003
>+++ configure.ac	Tue Jun 22 11:31:54 2004
>@@ -450,7 +450,8 @@
> 	[
> 		AC_MSG_RESULT(no)
> 		AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
>-	]
>+	],
>+	[	AC_MSG_WARN([cross compiling: not checking compiler sanity]) ]
> )
> 
> # Checks for header files.
>@@ -620,6 +621,10 @@
> 	[
> 		AC_MSG_RESULT(no)
> 		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
>+	],
>+	[ 
>+		AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME])
>+		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
> 	]
> )
> 
>@@ -771,6 +776,9 @@
> 			AC_MSG_RESULT(no)
> 			AC_DEFINE(BROKEN_SNPRINTF)
> 			AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
>+		],
>+		[
>+			AC_MSG_WARN([cross compiling: Assuming working snprintf()])
> 		]
> 	)
> fi
>@@ -979,6 +987,9 @@
> 	[
> 		AC_MSG_RESULT(not found)
> 		AC_MSG_ERROR(OpenSSL version header not found.)
>+	],
>+	[
>+		AC_MSG_WARN([cross compiling: not checking])
> 	]
> )
> 
>@@ -1012,6 +1023,9 @@
> 	[
> 		AC_MSG_RESULT(not found)
> 		AC_MSG_ERROR(OpenSSL library not found.)
>+	],
>+	[
>+		AC_MSG_WARN([cross compiling: not checking])
> 	]
> )
> 
>@@ -1031,6 +1045,9 @@
> 		AC_MSG_ERROR([Your OpenSSL headers do not match your library.
> Check config.log for details.
> Also see contrib/findssl.sh for help identifying header/library mismatches.])
>+	],
>+	[
>+		AC_MSG_WARN([cross compiling: not checking])
> 	]
> )
> 
>@@ -1060,6 +1077,12 @@
> 		# Default to use of the rand helper if OpenSSL doesn't
> 		# seed itself
> 		USE_RAND_HELPER=yes
>+	],
>+	[
>+		AC_MSG_WARN([cross compiling: assuming yes])
>+		# This is safe, since all recent OpenSSL versions will
>+		# complain at runtime if not seeded correctly. 
>+		OPENSSL_SEEDS_ITSELF=yes
> 	]
> )
> 
>@@ -1650,7 +1673,8 @@
> #else
> main() { exit(0); }
> #endif
>-		], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]
>+		], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
>+		AC_MSG_WARN([cross compiling: Assuming working snprintf()])
> 	)
> fi
> 
>@@ -1755,13 +1779,14 @@
> dnl make sure we're using the real structure members and not defines
> AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
> 		ac_cv_have_accrights_in_msghdr, [
>-	AC_TRY_RUN(
>+	AC_TRY_COMPILE(
> 		[
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <sys/uio.h>
> int main() {
> #ifdef msg_accrights
>+#error "msg_accrights is a macro"
> exit(1);
> #endif
> struct msghdr m;
>@@ -1779,13 +1804,14 @@
> 
> AC_CACHE_CHECK([for msg_control field in struct msghdr],
> 		ac_cv_have_control_in_msghdr, [
>-	AC_TRY_RUN(
>+	AC_TRY_COMPILE(
> 		[
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <sys/uio.h>
> int main() {
> #ifdef msg_control
>+#error "msg_control is a macro"
> exit(1);
> #endif
> struct msghdr m;
>@@ -2073,6 +2099,10 @@
> 	AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir")
> fi
> 
>+if test "$cross_compiling"; then
>+	echo cross compiling: Disabling /dev/ptmx test
>+	disable_ptmx_check=yes
>+fi
> if test -z "$no_dev_ptmx" ; then
> 	if test "x$disable_ptmx_check" != "xyes" ; then
> 		AC_CHECK_FILE("/dev/ptmx", 
>@@ -2083,13 +2113,18 @@
> 		)
> 	fi
> fi
>-AC_CHECK_FILE("/dev/ptc", 
>-	[
>-		AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
>-		have_dev_ptc=1
>-	]
>-)
> 
>+if test "$cross_compiling"; then
>+	echo cross compiling: Disabling /dev/ptc test
>+else
>+	AC_CHECK_FILE("/dev/ptc", 
>+		[
>+			AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
>+			have_dev_ptc=1
>+		]
>+	)
>+fi
>+	
> # Options from here on. Some of these are preset by platform above
> AC_ARG_WITH(mantype,
> 	[  --with-mantype=man|cat|doc  Set man page type],
>@@ -2182,9 +2217,13 @@
> 	)
> fi
> 
>-# check for /etc/default/login and use it if present.
>-AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
>-
>+if test "$cross_compiling"; then
>+	echo cross compiling: Disabling /etc/default/login test
>+else
>+	# check for /etc/default/login and use it if present.
>+	AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
>+fi
>+	
> if test "x$external_path_file" = "x/etc/default/login"; then
> 	AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
> fi

Actions: View | Diff

Attachments on bug 321: 123 | 124 | 655 | 656 | 657 | 710