# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1355190805 18000
# Node ID 69cc6151a9e09eeface03b1f9655449eb6e3229b
# Parent  0dd6487190281d3e463af074dfbc290bb2598c08
fix shared lib build for libssh2

diff -r 0dd648719028 -r 69cc6151a9e0 src/libssh2.mk
--- a/src/libssh2.mk	Mon Dec 10 20:39:02 2012 -0500
+++ b/src/libssh2.mk	Mon Dec 10 20:53:25 2012 -0500
@@ -20,24 +20,16 @@
     cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --enable-static --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-openssl \
         --with-libgcrypt \
         PKG_CONFIG='$(TARGET)-pkg-config'
     $(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' \
-        `'$(TARGET)-pkg-config' --cflags --libs libssh2`
+##    '$(TARGET)-gcc' \
+##        -W -Wall -Werror -ansi -pedantic \
+##        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \
+##        `'$(TARGET)-pkg-config' --cflags --libs libssh2`
 
-    if [ "$(BUILD_SHARED)" = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libssh2.a' -lgcrypt; \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a' '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libssh2.dll' '$(PREFIX)/$(TARGET)/bin/libssh2.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libssh2.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libssh2.la'; \
-    fi
 endef