Use external libssh2 instead of the bundled one

Author: SebDieBln

INSTALL

@@ -19,12 +19,13 @@ You will need:
 - wxGTK 2.8.x from http://www.wxwidgets.org/
 - libxml2 2.6.18 or above from http://www.xmlsoft.org/
 - libxslt 1.1.x or above from http://www.xmlsoft.org/
+- libssh2 1.10.0 or above from http://www.libssh2.org/
 - PostgreSQL 8.4 or above from http://www.postgresql.org/
 - Sphinx 1.0 or above from http://sphinx.pocoo.org/
 
 Building:
 
-1) Install libxml2 and libxslt if they are not already present on your system, 
+1) Install libssh2, libxml2 and libxslt if they are not already present on your system, 
    per the instructions included with them.
 
 2) Install PostgreSQL per the instructions included. It is recommended that you
@@ -75,12 +76,13 @@ You will need:
 - wxMac 2.8.x from http://www.wxwidgets.org/
 - libxml2 2.6.18 or above from http://www.xmlsoft.org/
 - libxslt 1.1.x or above from http://www.xmlsoft.org/
+- libssh2 1.10.0 or above from http://www.libssh2.org/
 - PostgreSQL 8.4 or above from http://www.postgresql.org/
 - Sphinx 1.0 or above from http://sphinx.pocoo.org/
 
 Building:
 
-1) Install libxml2 and libxslt per the instructions included with them into a 
+1) Install libssh2, libxml2 and libxslt per the instructions included with them into a 
    non-system location. The default versions included with OS X Panther and 
    Tiger are too old and will not work correctly with pgAdmin.
 
@@ -148,6 +150,7 @@ You will need:
    - Release DLLs
   If you want to build the documentation and/or the installer you additionally
   need the package "Source Code".
+- libssh2 1.10.0 or above from https://www.libssh2.org/
 - PostgreSQL 9.2.24 (binary distribution) from http://www.postgresql.org/
 - PostgreSQL 10.19 or later (binary distribution) from http://www.postgresql.org/
 - Sphinx 1.0 or above from http://sphinx.pocoo.org/
@@ -170,12 +173,15 @@ Building:
 3) Install PostgreSQL 9.2.24 to a convenient location pointed to by the %PGDIR%
    environment variable.
 
-4) Unpack the pgAdmin source code to a convenient location.
+4) Unpack, compile and install libssh2 to a convenient location pointed to by the
+   %LIBSSH2DIR% environment variable.
 
-5) Start Visual C++ and load the pgAdmin solution file. Build the required 
+5) Unpack the pgAdmin source code to a convenient location.
+
+6) Start Visual C++ and load the pgAdmin solution file. Build the required 
    targets.
 
-6) To run the resulting executable, you'll need to copy all of the
+7) To run the resulting executable, you'll need to copy all of the
    prerequisite DLLs from the wxWidgets and PostgreSQL installations into the
    directory where the EXE file is located, or have those directories in your
    path.

Makefile.am

@@ -88,7 +88,7 @@ endif
 # * -z2 - Unix style line endings
 # Also add the -n to make it not save .orig files (we have git for that)
 style:
-	astyle -n -p --style=allman -S -t4 -k3 -z2 `find . -name "*.cpp" -o -name "*.h" | egrep -v "(wx-build|xrcDialogs|pgadmin/libssh2|pgadmin/include/libssh2)"`
+	astyle -n -p --style=allman -S -t4 -k3 -z2 `find . -name "*.cpp" -o -name "*.h" | egrep -v "(wx-build|xrcDialogs)"`
 
 # Create HTML docs
 doc:

configure.ac.in

@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.h unistd.h sys/uio.h])
 AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
 AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
 AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -69,6 +68,8 @@ CHECK_LIBXML2
 LOCATE_LIBXSLT
 SETUP_LIBXSLT
 
+AC_CHECK_LIB([ssh2], [libssh2_session_init_ex], , [AC_MSG_ERROR([Couldn't find libssh2!])])
+
 # Configure parameters
 AC_ARG_WITH(libgcrypt,
 	AC_HELP_STRING([--with-libgcrypt],[Use Libgcrypt for crypto]),

pgadmin/Makefile.am

@@ -49,7 +49,6 @@ include gqb/module.mk
 include hotdraw/module.mk
 include ui/module.mk
 include utils/module.mk
-include libssh2/module.mk
 
 if SUN_CC
   __CFLAGS=""
@@ -80,11 +79,7 @@ nobase_dist_pkgdata_DATA += \
 	$(TMP_ui)
 endif
 
-if BUILD_SSH_TUNNEL
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
-else
 AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
-endif
 
 # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
 # for non-APPBUNDLE cases.
@@ -100,11 +95,7 @@ nobase_dist_data_DATA += \
 	$(TMP_ui)
 endif
 
-if BUILD_SSH_TUNNEL
-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
-else
 AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
-endif
 
 install-exec-hook:
 	cd $(bindir) ;\

pgadmin/include/module.mk

@@ -36,5 +36,4 @@ include include/gqb/module.mk
 include include/hotdraw/module.mk
 include include/utils/module.mk
 include include/ogl/module.mk
-include include/libssh2/module.mk