summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-03-26 10:27:33 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-03-26 10:27:33 +1100
commita83d90fbab8d8987d2086ce1fd5c5a05adb42c97 (patch)
tree70615b647fa69f43998c1770ae2cdf4b82ea3a66
parent7d09b8f8d90fb524e43bab1b675c0f7d5485dc8f (diff)
- (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
by Ingo Weinhold via Scott McCreary, ok djm@
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac10
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 88d4b2c1..30a7ce26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
20100326
- (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection
for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson
+ - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
+ by Ingo Weinhold via Scott McCreary, ok djm@
20100324
- (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory
diff --git a/configure.ac b/configure.ac
index 331fb457..7580ff59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.445 2010/03/09 09:42:31 dtucker Exp $
+# $Id: configure.ac,v 1.446 2010/03/25 23:27:33 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.445 $)
+AC_REVISION($Revision: 1.446 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -488,6 +488,12 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
*-*-dragonfly*)
SSHDLIBS="$SSHDLIBS -lcrypt"
;;
+*-*-haiku*)
+ LIBS="$LIBS -lbsd "
+ AC_CHECK_LIB(network, socket)
+ AC_DEFINE(HAVE_U_INT64_T)
+ MANTYPE=man
+ ;;
*-*-hpux*)
# first we define all of the options common to all HP-UX releases
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"