diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2005-08-18 21:22:22 +0000 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2005-08-18 21:22:22 +0000 |
| commit | d95242d2cde747151953387053a9649bd525d265 (patch) | |
| tree | a2a21ace0da2a9c72d32e7d136cd829e0519502a | |
| parent | bb50d8f46429cecb43826c824b2d8139dcdb793e (diff) | |
| download | libssh-d95242d2cde747151953387053a9649bd525d265.tar.gz libssh-d95242d2cde747151953387053a9649bd525d265.tar.xz libssh-d95242d2cde747151953387053a9649bd525d265.zip | |
oops, forgot to patch the Makefile.in for the ssh1 files. configure.in patch from Norbert kiesel to have a compile time ssh1 support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@11 7dcaeef0-15fb-0310-b436-a5af3365683c
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 23 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | libssh/Makefile.in | 2 |
4 files changed, 35 insertions, 1 deletions
diff --git a/config.h.in b/config.h.in index 1c2f7a78..4b54f23c 100644 --- a/config.h.in +++ b/config.h.in @@ -170,3 +170,6 @@ /* Define to rpl_realloc if the replacement function should be used. */ #undef realloc + +#undef HAVE_SSH1 + @@ -845,6 +845,11 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-ssh1 support SSH1 + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1400,6 +1405,24 @@ esac +enable_ssh1=${enable_ssh1:-"no"} +# Check whether --enable-ssh1 or --disable-ssh1 was given. +if test "${enable_ssh1+set}" = set; then + enableval="$enable_ssh1" + +fi; +echo "$as_me:$LINENO: checking for SSH1 support" >&5 +echo $ECHO_N "checking for SSH1 support... $ECHO_C" >&6 +if test $enable_ssh1 = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SSH1 1 +_ACEOF + +fi +echo "$as_me:$LINENO: result: $enable_ssh1" >&5 +echo "${ECHO_T}$enable_ssh1" >&6 + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/configure.in b/configure.in index a7e2580b..11c835c7 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,14 @@ esac AC_SUBST(DYLIB_EXTENSION) AC_SUBST(LIBSSH_LDFLAGS) +enable_ssh1=${enable_ssh1:-"no"} +AC_ARG_ENABLE(ssh1, [ --enable-ssh1 support SSH1]) +AC_MSG_CHECKING([for SSH1 support]) +if test $enable_ssh1 = "yes" ; then + AC_DEFINE(HAVE_SSH1,1,[Define to 1 if you want to enable SSH1]) +fi +AC_MSG_RESULT([$enable_ssh1]) + # Checks for programs. AC_PROG_CC AC_PROG_INSTALL diff --git a/libssh/Makefile.in b/libssh/Makefile.in index 6eed8135..21591a6a 100644 --- a/libssh/Makefile.in +++ b/libssh/Makefile.in @@ -2,7 +2,7 @@ OBJECTS= client.o packet.o dh.o crypt.o connect.o error.o buffer.o \ string.o kex.o channels.o options.o keys.o auth.o base64.o \ keyfiles.o misc.o gzip.o wrapper.o sftp.o server.o crc32.o \ - session.o messages.o + session.o messages.o channels1.o auth1.o SHELL = /bin/sh VPATH = @srcdir@ |