summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-10-27 10:45:36 -0700
committerTim Rice <tim@multitalents.net>2001-10-27 10:45:36 -0700
commitffdf4aa10f59d540003b17877d174982ef3cfe43 (patch)
tree58d10bdb438fe6267bd0bd4a1ff9887e00e012f8
parentafefd16b6e7078e5db300424a67c0d7650ed92dc (diff)
[configure.ac] Fixes for ReliantUNIX (don't use libucb)
Patch by Robert Dahlem <Robert.Dahlem@siemens.com>
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac9
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index eed1c3bca..334af61c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120011027
2 - (tim) [configure.ac] Fixes for ReliantUNIX (don't use libucb)
3 Patch by Robert Dahlem <Robert.Dahlem@siemens.com>
4
120011026 520011026
2 - (bal) Set the correct current time in login_utmp_only(). Patch by 6 - (bal) Set the correct current time in login_utmp_only(). Patch by
3 Wayne Davison <wayned@users.sourceforge.net> 7 Wayne Davison <wayned@users.sourceforge.net>
@@ -6770,4 +6774,4 @@
6770 - Wrote replacements for strlcpy and mkdtemp 6774 - Wrote replacements for strlcpy and mkdtemp
6771 - Released 1.0pre1 6775 - Released 1.0pre1
6772 6776
6773$Id: ChangeLog,v 1.1620 2001/10/27 00:33:18 tim Exp $ 6777$Id: ChangeLog,v 1.1621 2001/10/27 17:45:36 tim Exp $
diff --git a/configure.ac b/configure.ac
index 10cca440c..39654a270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.2 2001/10/25 17:01:31 tim Exp $ 1# $Id: configure.ac,v 1.3 2001/10/27 17:45:37 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -187,12 +187,15 @@ mips-sony-bsd|mips-sony-newsos4)
187 ;; 187 ;;
188*-sni-sysv*) 188*-sni-sysv*)
189 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 189 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
190 LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib" 190 # /usr/ucblib MUST NOT be searched on ReliantUNIX
191 LDFLAGS="$LDFLAGS -L/usr/local/lib"
191 IPADDR_IN_DISPLAY=yes 192 IPADDR_IN_DISPLAY=yes
192 AC_DEFINE(USE_PIPES) 193 AC_DEFINE(USE_PIPES)
193 AC_DEFINE(IP_TOS_IS_BROKEN) 194 AC_DEFINE(IP_TOS_IS_BROKEN)
194 AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) 195 AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
195 LIBS="$LIBS -lgen -lnsl -lucb" 196 # /usr/ucblib/libucb.a no longer needed on ReliantUNIX
197 # Attention: always take care to bind libsocket and libnsl before libc,
198 # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
196 ;; 199 ;;
197*-*-sysv4.2*) 200*-*-sysv4.2*)
198 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 201 CPPFLAGS="$CPPFLAGS -I/usr/local/include"