Mercurial > mxe-octave
changeset 2115:a6f0aed4afde
package libssh2: improve dependency handling
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 21 Nov 2011 00:36:34 +0100 |
| parents | 5b886542c865 |
| children | f8450d232f85 |
| files | src/libssh2-test.c src/libssh2.mk |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libssh2-test.c Sun Nov 20 16:58:42 2011 +0100 +++ b/src/libssh2-test.c Mon Nov 21 00:36:34 2011 +0100 @@ -8,7 +8,8 @@ { (void)argc; (void)argv; - + libssh2_init(0); printf("libssh2 version: %s", libssh2_version(0) ); + libssh2_exit(); return 0; }
--- a/src/libssh2.mk Sun Nov 20 16:58:42 2011 +0100 +++ b/src/libssh2.mk Mon Nov 21 00:36:34 2011 +0100 @@ -26,11 +26,12 @@ --prefix='$(PREFIX)/$(TARGET)' \ --without-openssl \ --with-libgcrypt \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(TARGET)-pkg-config' \ + LIBS="-lgcrypt `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \ - -lssh2 + `'$(TARGET)-pkg-config' --cflags --libs libssh2` endef