configure: check for min required version (1.8) of libssh2. Closes #420

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>

Author: stewid

configure

@@ -5142,12 +5142,12 @@ if test -n "$libssh2_CFLAGS"; then
     pkg_cv_libssh2_CFLAGS="$libssh2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2 >= 1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libssh2 >= 1.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libssh2_CFLAGS=`$PKG_CONFIG --cflags "libssh2" 2>/dev/null`
+  pkg_cv_libssh2_CFLAGS=`$PKG_CONFIG --cflags "libssh2 >= 1.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5159,12 +5159,12 @@ if test -n "$libssh2_LIBS"; then
     pkg_cv_libssh2_LIBS="$libssh2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libssh2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libssh2 >= 1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libssh2 >= 1.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libssh2_LIBS=`$PKG_CONFIG --libs "libssh2" 2>/dev/null`
+  pkg_cv_libssh2_LIBS=`$PKG_CONFIG --libs "libssh2 >= 1.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5185,9 +5185,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libssh2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2" 2>&1`
+	        libssh2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= 1.8" 2>&1`
         else
-	        libssh2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2" 2>&1`
+	        libssh2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= 1.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libssh2_PKG_ERRORS" >&5
@@ -5208,71 +5208,12 @@ $as_echo "yes" >&6; }
 fi
 fi
 
-if test "x${have_ssh2}" = xno; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing libssh2_version" >&5
-$as_echo_n "checking for library containing libssh2_version... " >&6; }
-if ${ac_cv_search_libssh2_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char libssh2_version ();
-int
-main ()
-{
-return libssh2_version ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' ssh2; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_libssh2_version=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_libssh2_version+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_libssh2_version+:} false; then :
-
-else
-  ac_cv_search_libssh2_version=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_libssh2_version" >&5
-$as_echo "$ac_cv_search_libssh2_version" >&6; }
-ac_res=$ac_cv_search_libssh2_version
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  have_ssh2=yes
-fi
-
-fi
-
 if test "x${have_ssh2}" = xno; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
   ---------------------------------------------
-   Unable to find the LibSSH2 library on this
-   system. Building a version without support
-   for SSH transport.
+   Unable to find the LibSSH2 (ver >= v1.8)
+   library on this system. Building git2r
+   without support for SSH transport.
 
    To build with SSH support, please install:
      libssh2-1-dev (package on e.g. Debian and Ubuntu)
@@ -5288,9 +5229,9 @@ if test "x${have_ssh2}" = xno; then
   ---------------------------------------------" >&5
 $as_echo "$as_me: WARNING:
   ---------------------------------------------
-   Unable to find the LibSSH2 library on this
-   system. Building a version without support
-   for SSH transport.
+   Unable to find the LibSSH2 (ver >= v1.8)
+   library on this system. Building git2r
+   without support for SSH transport.
 
    To build with SSH support, please install:
      libssh2-1-dev (package on e.g. Debian and Ubuntu)
@@ -6959,11 +6900,11 @@ CPPFLAGS="${CPPFLAGS} -DGIT2R_HAVE_GIT_ERROR"
 
 
 
-PKG_CFLAGS="${PKG_CFLAGS} ${LIBSSH2_CFLAGS}"
+PKG_CFLAGS="${PKG_CFLAGS}"
 
 PKG_CPPFLAGS="${CPPFLAGS}"
 
-PKG_LIBS="${LIBS} ${LIBSSH2_LIBS} ${LIBICONV}"
+PKG_LIBS="${LIBS} ${LIBICONV}"
 
 
 ac_config_files="$ac_config_files src/Makevars_libgit2"

configure.ac

@@ -337,22 +337,18 @@ esac
 # Check for LibSSH2
 have_ssh2=no
 if test [ -n "$PKG_CONFIG" ] ; then
-    PKG_CHECK_MODULES([libssh2], [libssh2],
+    PKG_CHECK_MODULES([libssh2], [libssh2 >= 1.8],
                       [CPPFLAGS="${libssh2_CFLAGS} ${CPPFLAGS}"
                        LIBS="${libssh2_LIBS} ${LIBS}"
                        have_ssh2=yes], [ ])
 fi
 
-if test "x${have_ssh2}" = xno; then
-    AC_SEARCH_LIBS([libssh2_version], [ssh2], [have_ssh2=yes])
-fi
-
 if test "x${have_ssh2}" = xno; then
     AC_MSG_WARN([
   ---------------------------------------------
-   Unable to find the LibSSH2 library on this
-   system. Building a version without support
-   for SSH transport.
+   Unable to find the LibSSH2 (ver >= v1.8)
+   library on this system. Building git2r
+   without support for SSH transport.
 
    To build with SSH support, please install:
      libssh2-1-dev (package on e.g. Debian and Ubuntu)
@@ -480,9 +476,9 @@ CPPFLAGS="${CPPFLAGS} -DGIT2R_HAVE_GIT_ERROR"
 
 AC_SUBST(GIT2R_SRC_REGEX)
 AC_SUBST(GIT2R_SRC_SHA1DC)
-AC_SUBST([PKG_CFLAGS], ["${PKG_CFLAGS} ${LIBSSH2_CFLAGS}"])
+AC_SUBST([PKG_CFLAGS], ["${PKG_CFLAGS}"])
 AC_SUBST([PKG_CPPFLAGS], ["${CPPFLAGS}"])
-AC_SUBST([PKG_LIBS], ["${LIBS} ${LIBSSH2_LIBS} ${LIBICONV}"])
+AC_SUBST([PKG_LIBS], ["${LIBS} ${LIBICONV}"])
 
 AC_CONFIG_FILES([src/Makevars_libgit2])