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

Collapse All | Expand All

(-)configure.ac (-20 / +32 lines)
Lines 769-776 AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADER Link Here
769
			ac_cv_have_broken_dirname, [
769
			ac_cv_have_broken_dirname, [
770
			save_LIBS="$LIBS"
770
			save_LIBS="$LIBS"
771
			LIBS="$LIBS -lgen"
771
			LIBS="$LIBS -lgen"
772
			AC_TRY_RUN(
772
			AC_RUN_IFELSE(
773
				[
773
				[AC_LANG_SOURCE([[
774
#include <libgen.h>
774
#include <libgen.h>
775
#include <string.h>
775
#include <string.h>
776
776
Lines 785-793 int main(int argc, char **argv) { Link Here
785
	exit(0);
785
	exit(0);
786
    }
786
    }
787
}
787
}
788
				],
788
				]])],
789
				[ ac_cv_have_broken_dirname="no" ],
790
				[ ac_cv_have_broken_dirname="yes" ],
789
				[ ac_cv_have_broken_dirname="no" ],
791
				[ ac_cv_have_broken_dirname="no" ],
790
				[ ac_cv_have_broken_dirname="yes" ]
791
			)
792
			)
792
			LIBS="$save_LIBS"
793
			LIBS="$save_LIBS"
793
		])
794
		])
Lines 1002-1011 AC_ARG_WITH(skey, Link Here
1002
			SKEY_MSG="yes"
1003
			SKEY_MSG="yes"
1003
1004
1004
			AC_MSG_CHECKING([for s/key support])
1005
			AC_MSG_CHECKING([for s/key support])
1005
			AC_TRY_RUN(
1006
			AC_TRY_COMPILE(
1006
				[
1007
				[
1007
#include <stdio.h>
1008
#include <stdio.h>
1008
#include <skey.h>
1009
#include <skey.h>
1010
				],
1011
				[
1009
int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
1012
int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
1010
				],
1013
				],
1011
				[AC_MSG_RESULT(yes)],
1014
				[AC_MSG_RESULT(yes)],
Lines 1377-1391 fi Link Here
1377
dnl see whether mkstemp() requires XXXXXX
1380
dnl see whether mkstemp() requires XXXXXX
1378
if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
1381
if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
1379
AC_MSG_CHECKING([for (overly) strict mkstemp])
1382
AC_MSG_CHECKING([for (overly) strict mkstemp])
1380
AC_TRY_RUN(
1383
AC_RUN_IFELSE(
1381
	[
1384
	[AC_LANG_SOURCE([[
1382
#include <stdlib.h>
1385
#include <stdlib.h>
1383
main() { char template[]="conftest.mkstemp-test";
1386
main() { char template[]="conftest.mkstemp-test";
1384
if (mkstemp(template) == -1)
1387
if (mkstemp(template) == -1)
1385
	exit(1);
1388
	exit(1);
1386
unlink(template); exit(0);
1389
unlink(template); exit(0);
1387
}
1390
}
1388
	],
1391
	]])],
1389
	[
1392
	[
1390
		AC_MSG_RESULT(no)
1393
		AC_MSG_RESULT(no)
1391
	],
1394
	],
Lines 1403-1410 fi Link Here
1403
dnl make sure that openpty does not reacquire controlling terminal
1406
dnl make sure that openpty does not reacquire controlling terminal
1404
if test ! -z "$check_for_openpty_ctty_bug"; then
1407
if test ! -z "$check_for_openpty_ctty_bug"; then
1405
	AC_MSG_CHECKING(if openpty correctly handles controlling tty)
1408
	AC_MSG_CHECKING(if openpty correctly handles controlling tty)
1406
	AC_TRY_RUN(
1409
	AC_RUN_IFELSE(
1407
		[
1410
		[AC_LANG_SOURCE([[
1408
#include <stdio.h>
1411
#include <stdio.h>
1409
#include <sys/fcntl.h>
1412
#include <sys/fcntl.h>
1410
#include <sys/types.h>
1413
#include <sys/types.h>
Lines 1436-1448 main() Link Here
1436
			exit(0);	/* Did not acquire ctty: OK */
1439
			exit(0);	/* Did not acquire ctty: OK */
1437
	}
1440
	}
1438
}
1441
}
1439
		],
1442
		]])],
1440
		[
1443
		[
1441
			AC_MSG_RESULT(yes)
1444
			AC_MSG_RESULT(yes)
1442
		],
1445
		],
1443
		[
1446
		[
1444
			AC_MSG_RESULT(no)
1447
			AC_MSG_RESULT(no)
1445
			AC_DEFINE(SSHD_ACQUIRES_CTTY)
1448
			AC_DEFINE(SSHD_ACQUIRES_CTTY)
1449
		],
1450
		[
1451
			AC_MSG_RESULT(cross-compiling, assuming yes)
1446
		]
1452
		]
1447
	)
1453
	)
1448
fi
1454
fi
Lines 1450-1457 fi Link Here
1450
if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
1456
if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
1451
    test "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
1457
    test "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
1452
	AC_MSG_CHECKING(if getaddrinfo seems to work)
1458
	AC_MSG_CHECKING(if getaddrinfo seems to work)
1453
	AC_TRY_RUN(
1459
	AC_RUN_IFELSE(
1454
		[
1460
		[AC_LANG_SOURCE([[
1455
#include <stdio.h>
1461
#include <stdio.h>
1456
#include <sys/socket.h>
1462
#include <sys/socket.h>
1457
#include <netdb.h>
1463
#include <netdb.h>
Lines 1505-1517 main(void) Link Here
1505
	}
1511
	}
1506
	exit(0);
1512
	exit(0);
1507
}
1513
}
1508
		],
1514
		]])],
1509
		[
1515
		[
1510
			AC_MSG_RESULT(yes)
1516
			AC_MSG_RESULT(yes)
1511
		],
1517
		],
1512
		[
1518
		[
1513
			AC_MSG_RESULT(no)
1519
			AC_MSG_RESULT(no)
1514
			AC_DEFINE(BROKEN_GETADDRINFO)
1520
			AC_DEFINE(BROKEN_GETADDRINFO)
1521
		],
1522
		[
1523
			AC_MSG_RESULT(cross-compiling, assuming yes)
1515
		]
1524
		]
1516
	)
1525
	)
1517
fi
1526
fi
Lines 1519-1526 fi Link Here
1519
if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
1528
if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
1520
    test "x$check_for_aix_broken_getaddrinfo" = "x1"; then
1529
    test "x$check_for_aix_broken_getaddrinfo" = "x1"; then
1521
	AC_MSG_CHECKING(if getaddrinfo seems to work)
1530
	AC_MSG_CHECKING(if getaddrinfo seems to work)
1522
	AC_TRY_RUN(
1531
	AC_RUN_IFELSE(
1523
		[
1532
		[AC_LANG_SOURCE([[
1524
#include <stdio.h>
1533
#include <stdio.h>
1525
#include <sys/socket.h>
1534
#include <sys/socket.h>
1526
#include <netdb.h>
1535
#include <netdb.h>
Lines 1562-1568 main(void) Link Here
1562
	}
1571
	}
1563
	exit(0);
1572
	exit(0);
1564
}
1573
}
1565
		],
1574
		]])],
1566
		[
1575
		[
1567
			AC_MSG_RESULT(yes)
1576
			AC_MSG_RESULT(yes)
1568
			AC_DEFINE(AIX_GETNAMEINFO_HACK, 1,
1577
			AC_DEFINE(AIX_GETNAMEINFO_HACK, 1,
Lines 1572-1577 main(void) Link Here
1572
		[
1581
		[
1573
			AC_MSG_RESULT(no)
1582
			AC_MSG_RESULT(no)
1574
			AC_DEFINE(BROKEN_GETADDRINFO)
1583
			AC_DEFINE(BROKEN_GETADDRINFO)
1584
		],
1585
			AC_MSG_RESULT(cross-compiling, assuming no)
1575
		]
1586
		]
1576
	)
1587
	)
1577
fi
1588
fi
Lines 3129-3136 $external_path_file .]) Link Here
3129
If PATH is defined in $external_path_file, ensure the path to scp is included,
3140
If PATH is defined in $external_path_file, ensure the path to scp is included,
3130
otherwise scp will not work.])
3141
otherwise scp will not work.])
3131
		fi
3142
		fi
3132
		AC_TRY_RUN(
3143
		AC_RUN_IFELSE(
3133
			[
3144
			[AC_LANG_SOURCE([[
3134
/* find out what STDPATH is */
3145
/* find out what STDPATH is */
3135
#include <stdio.h>
3146
#include <stdio.h>
3136
#ifdef HAVE_PATHS_H
3147
#ifdef HAVE_PATHS_H
Lines 3162-3168 main() Link Here
3162
3173
3163
	exit(0);
3174
	exit(0);
3164
}
3175
}
3165
		], [ user_path=`cat conftest.stdpath` ],
3176
		]])],
3177
		[ user_path=`cat conftest.stdpath` ],
3166
		[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ],
3178
		[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ],
3167
		[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ]
3179
		[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ]
3168
	)
3180
	)

Return to bug 1097