diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -68,6 +68,8 @@ | |||
68 | - djm@cvs.openbsd.org 2011/05/04 21:15:29 | 68 | - djm@cvs.openbsd.org 2011/05/04 21:15:29 |
69 | [authfile.c authfile.h ssh-add.c] | 69 | [authfile.c authfile.h ssh-add.c] |
70 | allow "ssh-add - < key"; feedback and ok markus@ | 70 | allow "ssh-add - < key"; feedback and ok markus@ |
71 | - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE | ||
72 | so autoreconf 2.68 is happy. | ||
71 | 73 | ||
72 | 20110221 | 74 | 20110221 |
73 | - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the | 75 | - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the |
diff --git a/configure.ac b/configure.ac index 573c09710..5357cab60 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.472 2011/05/05 03:48:37 djm Exp $ | 1 | # $Id: configure.ac,v 1.473 2011/05/05 04:44:25 tim 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.472 $) | 18 | AC_REVISION($Revision: 1.473 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -24,7 +24,7 @@ AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{ | |||
24 | AC_MSG_CHECKING([if $CC supports $1]) | 24 | AC_MSG_CHECKING([if $CC supports $1]) |
25 | saved_CFLAGS="$CFLAGS" | 25 | saved_CFLAGS="$CFLAGS" |
26 | CFLAGS="$CFLAGS $1" | 26 | CFLAGS="$CFLAGS $1" |
27 | AC_COMPILE_IFELSE([void main(void) { return 0; }], | 27 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])], |
28 | [ AC_MSG_RESULT([yes]) ], | 28 | [ AC_MSG_RESULT([yes]) ], |
29 | [ AC_MSG_RESULT([no]) | 29 | [ AC_MSG_RESULT([no]) |
30 | CFLAGS="$saved_CFLAGS" ] | 30 | CFLAGS="$saved_CFLAGS" ] |