summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c869db7d9..d0cd86c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 asprintf() implementation, after syncing our {v,}snprintf() implementation 4 asprintf() implementation, after syncing our {v,}snprintf() implementation
5 with some extra fixes from Samba's version. With help and debugging from 5 with some extra fixes from Samba's version. With help and debugging from
6 dtucker and tim; ok dtucker@ 6 dtucker and tim; ok dtucker@
7 - (dtucker) [configure.ac] Fix typos in comments and AC_SEARCH_LIB argument
8 order in Reliant Unix block. Patch from johane at lysator.liu.se.
7 9
820051122 1020051122
9 - (dtucker) OpenBSD CVS Sync 11 - (dtucker) OpenBSD CVS Sync
@@ -3340,4 +3342,4 @@
3340 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3342 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3341 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3343 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3342 3344
3343$Id: ChangeLog,v 1.4003 2005/11/24 08:58:19 djm Exp $ 3345$Id: ChangeLog,v 1.4004 2005/11/24 11:34:54 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 396552888..339c23437 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.308 2005/11/24 08:58:20 djm Exp $ 1# $Id: configure.ac,v 1.309 2005/11/24 11:34:54 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -410,8 +410,8 @@ mips-sony-bsd|mips-sony-newsos4)
410*-sni-sysv*) 410*-sni-sysv*)
411 # /usr/ucblib MUST NOT be searched on ReliantUNIX 411 # /usr/ucblib MUST NOT be searched on ReliantUNIX
412 AC_CHECK_LIB(dl, dlsym, ,) 412 AC_CHECK_LIB(dl, dlsym, ,)
413 # -lresolv needs to be at then end of LIBS or DNS lookups break 413 # -lresolv needs to be at the end of LIBS or DNS lookups break
414 AC_CHECK_LIB(res_query, resolv, [ LIBS="$LIBS -lresolv" ]) 414 AC_CHECK_LIB(resolv, res_query, [ LIBS="$LIBS -lresolv" ])
415 IPADDR_IN_DISPLAY=yes 415 IPADDR_IN_DISPLAY=yes
416 AC_DEFINE(USE_PIPES) 416 AC_DEFINE(USE_PIPES)
417 AC_DEFINE(IP_TOS_IS_BROKEN) 417 AC_DEFINE(IP_TOS_IS_BROKEN)
@@ -911,7 +911,7 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
911 [ 911 [
912 AC_MSG_RESULT(no) 912 AC_MSG_RESULT(no)
913 AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, 913 AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1,
914 [Define in your struct dirent expects you to 914 [Define if your struct dirent expects you to
915 allocate extra space for d_name]) 915 allocate extra space for d_name])
916 ], 916 ],
917 [ 917 [