diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-03-26 10:27:33 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-03-26 10:27:33 +1100 |
commit | a83d90fbab8d8987d2086ce1fd5c5a05adb42c97 (patch) | |
tree | 70615b647fa69f43998c1770ae2cdf4b82ea3a66 | |
parent | 7d09b8f8d90fb524e43bab1b675c0f7d5485dc8f (diff) |
- (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
by Ingo Weinhold via Scott McCreary, ok djm@
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 10 |
2 files changed, 10 insertions, 2 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20100326 | 1 | 20100326 |
2 | - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection | 2 | - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection |
3 | for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson | 3 | for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson |
4 | - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally | ||
5 | by Ingo Weinhold via Scott McCreary, ok djm@ | ||
4 | 6 | ||
5 | 20100324 | 7 | 20100324 |
6 | - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory | 8 | - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory |
diff --git a/configure.ac b/configure.ac index 331fb4572..7580ff591 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.445 2010/03/09 09:42:31 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.446 2010/03/25 23:27:33 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.445 $) | 18 | AC_REVISION($Revision: 1.446 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -488,6 +488,12 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
488 | *-*-dragonfly*) | 488 | *-*-dragonfly*) |
489 | SSHDLIBS="$SSHDLIBS -lcrypt" | 489 | SSHDLIBS="$SSHDLIBS -lcrypt" |
490 | ;; | 490 | ;; |
491 | *-*-haiku*) | ||
492 | LIBS="$LIBS -lbsd " | ||
493 | AC_CHECK_LIB(network, socket) | ||
494 | AC_DEFINE(HAVE_U_INT64_T) | ||
495 | MANTYPE=man | ||
496 | ;; | ||
491 | *-*-hpux*) | 497 | *-*-hpux*) |
492 | # first we define all of the options common to all HP-UX releases | 498 | # first we define all of the options common to all HP-UX releases |
493 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | 499 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" |