summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac12
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a2a38fde..ce319f38b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120030911
2 - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after
3 the dirname test, to allow a broken dirname to be detected correctly.
4 Based partially on patch supplied by alex.kiernan at thus.net. ok djm@
5
120030910 620030910
2 - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine. 7 - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine.
3 Patch from wendyp at cray.com. 8 Patch from wendyp at cray.com.
@@ -1059,4 +1064,4 @@
1059 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1064 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1060 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1065 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1061 1066
1062$Id: ChangeLog,v 1.2978 2003/09/10 10:17:40 dtucker Exp $ 1067$Id: ChangeLog,v 1.2979 2003/09/11 04:42:55 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index cac1bbf2a..d5d6f546d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.149 2003/09/10 05:22:45 dtucker Exp $ 1# $Id: configure.ac,v 1.150 2003/09/11 04:42:56 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -442,7 +442,7 @@ int main(){exit(0);}
442 442
443# Checks for header files. 443# Checks for header files.
444AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \ 444AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
445 getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \ 445 getopt.h glob.h ia.h lastlog.h limits.h login.h \
446 login_cap.h maillock.h netdb.h netgroup.h \ 446 login_cap.h maillock.h netdb.h netgroup.h \
447 netinet/in_systm.h paths.h pty.h readpassphrase.h \ 447 netinet/in_systm.h paths.h pty.h readpassphrase.h \
448 rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ 448 rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
@@ -463,9 +463,6 @@ if test "x$with_tcp_wrappers" != "xno" ; then
463 fi 463 fi
464fi 464fi
465 465
466AC_CHECK_FUNC(getspnam, ,
467 AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
468
469AC_ARG_WITH(rpath, 466AC_ARG_WITH(rpath,
470 [ --without-rpath Disable auto-added -R linker paths], 467 [ --without-rpath Disable auto-added -R linker paths],
471 [ 468 [
@@ -676,7 +673,6 @@ AC_CHECK_FUNCS(\
676) 673)
677 674
678AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) 675AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
679AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
680 676
681dnl Make sure prototypes are defined for these before using them. 677dnl Make sure prototypes are defined for these before using them.
682AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)]) 678AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
@@ -726,6 +722,10 @@ int main(int argc, char **argv) {
726 ]) 722 ])
727]) 723])
728 724
725AC_CHECK_FUNC(getspnam, ,
726 AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
727AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
728
729dnl Checks for time functions 729dnl Checks for time functions
730AC_CHECK_FUNCS(gettimeofday time) 730AC_CHECK_FUNCS(gettimeofday time)
731dnl Checks for utmp functions 731dnl Checks for utmp functions