diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-12-11 19:39:58 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-12-11 19:39:58 +0000 |
| commit | ad9f0cf2a32a9f68dd28b26cc9eb1a384e910804 (patch) | |
| tree | 685674a2077fd24dfbb4b2e508d5904b4f260898 /configure.ac | |
| parent | 501b9f712fa5543bac73976eb4d9e3a503b098ed (diff) | |
| download | sshfs-ad9f0cf2a32a9f68dd28b26cc9eb1a384e910804.tar sshfs-ad9f0cf2a32a9f68dd28b26cc9eb1a384e910804.tar.gz sshfs-ad9f0cf2a32a9f68dd28b26cc9eb1a384e910804.tar.bz2 sshfs-ad9f0cf2a32a9f68dd28b26cc9eb1a384e910804.zip | |
Released 1.9
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 574377d..d7faee0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ -AC_INIT(sshfs-fuse, 1.8) +AC_INIT(sshfs-fuse, 1.9) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AC_PROG_CC +AM_PROG_CC_C_O CFLAGS="$CFLAGS -Wall -W" LIBS= AC_SEARCH_LIBS(dlsym, [dl]) @@ -13,6 +14,22 @@ LIBS= AC_ARG_ENABLE(sshnodelay, [ --disable-sshnodelay Don't compile NODELAY workaround for ssh]) +if test -z "$enable_sshnodelay"; then + AC_MSG_CHECKING([OpenSSH version]) + [eval `ssh -V 2>&1 | sed -n 's/^OpenSSH_\([1-9][0-9]*\)\.\([0-9][0-9]*\).*/ssh_major=\1 ssh_minor=\2/p'`] + if test "x$ssh_major" != x -a "x$ssh_minor" != x; then + if test $ssh_major -gt 4 -o \( $ssh_major = 4 -a $ssh_minor -ge 4 \); then + AC_MSG_RESULT([$ssh_major.$ssh_minor >= 4.4, disabling NODELAY workaround]) + enable_sshnodelay=no + else + AC_MSG_RESULT([$ssh_major.$ssh_minor < 4.4, enabling NODELAY workaround]) + enable_sshnodelay=yes + fi + else + AC_MSG_RESULT([not found]) + fi +fi + if test "$enable_sshnodelay" != "no"; then AC_DEFINE(SSH_NODELAY_WORKAROUND, 1, [Compile ssh NODELAY workaround]) fi |