diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-03 21:04:36 +0100 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-11-03 21:04:36 +0100 |
commit | 5e002635fcfda365a0f7c0e84cd534c44abaa6a9 (patch) | |
tree | 94855644f7e5bee3bb8d05dc777aded1e3a26dd5 | |
parent | e71c28f6a0049617b1bae700524c69c2c8215e09 (diff) | |
download | libssh-5e002635fcfda365a0f7c0e84cd534c44abaa6a9.tar.gz libssh-5e002635fcfda365a0f7c0e84cd534c44abaa6a9.tar.xz libssh-5e002635fcfda365a0f7c0e84cd534c44abaa6a9.zip |
Fix compilation on freebsd 6.0 which lacks argp.h
-rw-r--r-- | ConfigureChecks.cmake | 1 | ||||
-rw-r--r-- | examples/samplesshd.c | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 8ca8258..c2bed2e 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -21,6 +21,7 @@ check_c_compiler_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN) endif(CMAKE_COMPILER_IS_GNUC) # HEADER FILES +check_include_file(argp.h HAVE_ARGP_H) check_include_file(pty.h HAVE_PTY_H) check_include_file(terminos.h HAVE_TERMIOS_H) if (WIN32) diff --git a/examples/samplesshd.c b/examples/samplesshd.c index 142e880..f2013b7 100644 --- a/examples/samplesshd.c +++ b/examples/samplesshd.c @@ -14,7 +14,10 @@ clients must be made or how a client should react. #include <libssh/libssh.h> #include <libssh/server.h> + +#ifdef HAVE_ARGP_H #include <argp.h> +#endif #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -34,7 +37,7 @@ static int auth_password(char *user, char *password){ return 0; return 1; // authenticated } - +#ifdef HAVE_ARGP_H const char *argp_program_version = "libssh server example " SSH_STRINGIFY(LIBSSH_VERSION); const char *argp_program_bug_address = "<libssh@libssh.org>"; @@ -135,6 +138,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { /* Our argp parser. */ static struct argp argp = {options, parse_opt, args_doc, doc, NULL, NULL, NULL}; +#endif /* HAVE_ARGP_H */ int main(int argc, char **argv){ ssh_session session; @@ -153,12 +157,13 @@ int main(int argc, char **argv){ ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_DSAKEY, KEYS_FOLDER "ssh_host_dsa_key"); ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_RSAKEY, KEYS_FOLDER "ssh_host_rsa_key"); +#ifdef HAVE_ARGP_H /* * Parse our arguments; every option seen by parse_opt will * be reflected in arguments. */ argp_parse (&argp, argc, argv, 0, 0, sshbind); - +#endif if(ssh_bind_listen(sshbind)<0){ printf("Error listening to socket: %s\n",ssh_get_error(sshbind)); return 1; |