Attachment #123 for bug #321




        ]
)

AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
AC_TRY_RUN(
	[
#include <sys/types.h>
#include <dirent.h>
int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));}
	],
	[AC_MSG_RESULT(yes)], 
	[
		AC_MSG_RESULT(no)
		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
	]
)

# Check whether user wants S/Key support
SKEY_MSG="no" 
AC_ARG_WITH(skey,

				[
					AC_MSG_RESULT(no)
					AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
				]
				[
					AC_MSG_RESULT(no)
					AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
				])
		fi
	]

		AC_MSG_RESULT(yes)
		AC_DEFINE(HAVE_MMAP_ANON_SHARED)
	],
	[ AC_MSG_RESULT(no) ],
	[ AC_MSG_RESULT(no) ] 
)
fi

}
				],
				[ ac_cv_have_broken_dirname="no" ],
				[ ac_cv_have_broken_dirname="yes" ],
				[ ac_cv_have_broken_dirname="yes" ]
			)
			LIBS="$save_LIBS"

			AC_MSG_RESULT(no)
			AC_DEFINE(BROKEN_SNPRINTF)
			AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
		],
		[
			AC_MSG_RESULT(assuming no)
			AC_DEFINE(BROKEN_SNPRINTF)
		]
	)
fi

	[
		AC_MSG_RESULT(no)
		AC_MSG_ERROR(Your OpenSSL headers do not match your library)
	],
	[
		AC_MSG_RESULT(yes)
		AC_MSG_WARN(Not sure, hoping so)
	]
)


		# Default to use of the rand helper if OpenSSL doesn't
		# seed itself
		USE_RAND_HELPER=yes
	],
	[
		AC_MSG_RESULT(no)
		# Default to use of the rand helper if OpenSSL doesn't
		# seed itself
		USE_RAND_HELPER=yes
		AC_MSG_WARN(Not sure, assuming no)
	]
)


#else
main() { exit(0); }
#endif
		], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
		[ AC_DEFINE(BROKEN_SNPRINTF) ]
	)
fi
AC_SUBST(NO_SFTP)

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_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;


AC_CACHE_CHECK([for msg_control field in struct msghdr],
		ac_cv_have_control_in_msghdr, [
	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;


if test -z "$no_dev_ptmx" ; then
	if test "x$disable_ptmx_check" != "xyes" ; then
		if test -f "/dev/ptc" ; then
			AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)
			have_dev_ptmx=1
		fi
			]
		)
	fi
fi

if test -f "/dev/ptc" ; then
	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,

Return to bug 321

Lines 463-482 Link Here

(-)openssh-3.4p1/configure.ac (-29 / +40 lines)
463	]	463	]
464	)	464	)
465		465
466	AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
467	AC_TRY_RUN(
468	[
469	#include <sys/types.h>
470	#include <dirent.h>
471	int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));}
472	],
473	[AC_MSG_RESULT(yes)],
474	[
475	AC_MSG_RESULT(no)
476	AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
477	]
478	)
479
480	# Check whether user wants S/Key support	466	# Check whether user wants S/Key support
481	SKEY_MSG="no"	467	SKEY_MSG="no"
482	AC_ARG_WITH(skey,	468	AC_ARG_WITH(skey,
Lines 505-510 Link Here
505	[	491	[
506	AC_MSG_RESULT(no)	492	AC_MSG_RESULT(no)
507	AC_MSG_ERROR([** Incomplete or missing s/key libraries.])	493	AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
		494	]
		495	[
		496	AC_MSG_RESULT(no)
		497	AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
508	])	498	])
509	fi	499	fi
510	]	500	]
Lines 597-602 Link Here
597	AC_MSG_RESULT(yes)	587	AC_MSG_RESULT(yes)
598	AC_DEFINE(HAVE_MMAP_ANON_SHARED)	588	AC_DEFINE(HAVE_MMAP_ANON_SHARED)
599	],	589	],
		590	[ AC_MSG_RESULT(no) ],
600	[ AC_MSG_RESULT(no) ]	591	[ AC_MSG_RESULT(no) ]
601	)	592	)
602	fi	593	fi
Lines 626-631 Link Here
626	}	617	}
627	],	618	],
628	[ ac_cv_have_broken_dirname="no" ],	619	[ ac_cv_have_broken_dirname="no" ],
		620	[ ac_cv_have_broken_dirname="yes" ],
629	[ ac_cv_have_broken_dirname="yes" ]	621	[ ac_cv_have_broken_dirname="yes" ]
630	)	622	)
631	LIBS="$save_LIBS"	623	LIBS="$save_LIBS"
Lines 670-675 Link Here
670	AC_MSG_RESULT(no)	662	AC_MSG_RESULT(no)
671	AC_DEFINE(BROKEN_SNPRINTF)	663	AC_DEFINE(BROKEN_SNPRINTF)
672	AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])	664	AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
		665	],
		666	[
		667	AC_MSG_RESULT(assuming no)
		668	AC_DEFINE(BROKEN_SNPRINTF)
673	]	669	]
674	)	670	)
675	fi	671	fi
Lines 784-789 Link Here
784	[	780	[
785	AC_MSG_RESULT(no)	781	AC_MSG_RESULT(no)
786	AC_MSG_ERROR(Your OpenSSL headers do not match your library)	782	AC_MSG_ERROR(Your OpenSSL headers do not match your library)
		783	],
		784	[
		785	AC_MSG_RESULT(yes)
		786	AC_MSG_WARN(Not sure, hoping so)
787	]	787	]
788	)	788	)
789		789
Lines 813-818 Link Here
813	# Default to use of the rand helper if OpenSSL doesn't	813	# Default to use of the rand helper if OpenSSL doesn't
814	# seed itself	814	# seed itself
815	USE_RAND_HELPER=yes	815	USE_RAND_HELPER=yes
		816	],
		817	[
		818	AC_MSG_RESULT(no)
		819	# Default to use of the rand helper if OpenSSL doesn't
		820	# seed itself
		821	USE_RAND_HELPER=yes
		822	AC_MSG_WARN(Not sure, assuming no)
816	]	823	]
817	)	824	)
818		825
Lines 1417-1423 Link Here
1417	#else	1424	#else
1418	main() { exit(0); }	1425	main() { exit(0); }
1419	#endif	1426	#endif
1420	], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ]	1427	], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
		1428	[ AC_DEFINE(BROKEN_SNPRINTF) ]
1421	)	1429	)
1422	fi	1430	fi
1423	AC_SUBST(NO_SFTP)	1431	AC_SUBST(NO_SFTP)
Lines 1523-1535 Link Here
1523	dnl make sure we're using the real structure members and not defines	1531	dnl make sure we're using the real structure members and not defines
1524	AC_CACHE_CHECK([for msg_accrights field in struct msghdr],	1532	AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
1525	ac_cv_have_accrights_in_msghdr, [	1533	ac_cv_have_accrights_in_msghdr, [
1526	AC_TRY_RUN(	1534	AC_TRY_COMPILE(
1527	[	1535	[
1528	#include <sys/types.h>	1536	#include <sys/types.h>
1529	#include <sys/socket.h>	1537	#include <sys/socket.h>
1530	#include <sys/uio.h>	1538	#include <sys/uio.h>
		1539	],
		1540	[
1531	int main() {	1541	int main() {
1532	#ifdef msg_accrights	1542	#ifdef msg_accrights
		1543	#error "msg_accrights is a macro"
1533	exit(1);	1544	exit(1);
1534	#endif	1545	#endif
1535	struct msghdr m;	1546	struct msghdr m;
Lines 1547-1559 Link Here
1547		1558
1548	AC_CACHE_CHECK([for msg_control field in struct msghdr],	1559	AC_CACHE_CHECK([for msg_control field in struct msghdr],
1549	ac_cv_have_control_in_msghdr, [	1560	ac_cv_have_control_in_msghdr, [
1550	AC_TRY_RUN(	1561	AC_TRY_COMPILE(
1551	[	1562	[
1552	#include <sys/types.h>	1563	#include <sys/types.h>
1553	#include <sys/socket.h>	1564	#include <sys/socket.h>
1554	#include <sys/uio.h>	1565	#include <sys/uio.h>
		1566	],
		1567	[
1555	int main() {	1568	int main() {
1556	#ifdef msg_control	1569	#ifdef msg_control
		1570	#error "msg_control is a macro"
1557	exit(1);	1571	exit(1);
1558	#endif	1572	#endif
1559	struct msghdr m;	1573	struct msghdr m;
Lines 1860-1879 Link Here
1860		1874
1861	if test -z "$no_dev_ptmx" ; then	1875	if test -z "$no_dev_ptmx" ; then
1862	if test "x$disable_ptmx_check" != "xyes" ; then	1876	if test "x$disable_ptmx_check" != "xyes" ; then
1863	AC_CHECK_FILE("/dev/ptmx",	1877	if test -f "/dev/ptc" ; then
1864	[	1878	AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)
1865	AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)	1879	have_dev_ptmx=1
1866	have_dev_ptmx=1	1880	fi
1867	]
1868	)
1869	fi	1881	fi
1870	fi	1882	fi
1871	AC_CHECK_FILE("/dev/ptc",	1883
1872	[	1884	if test -f "/dev/ptc" ; then
1873	AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)	1885	AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
1874	have_dev_ptc=1	1886	have_dev_ptc=1
1875	]	1887	fi
1876	)
1877		1888
1878	# Options from here on. Some of these are preset by platform above	1889	# Options from here on. Some of these are preset by platform above
1879	AC_ARG_WITH(mantype,	1890	AC_ARG_WITH(mantype,