generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: fix $VERSION

Browse Source 
Stop using the $VERSION variable as it seems to be magically used by
autoconfig itself and thus gets set to the value set in AC_INIT()
without us wanting that. $LIBSSH2VER is now the libssh2 version as
detected.

Reported by: Paul Howarth
Bug: http://www.libssh2.org/mail/libssh2-devel-archive-2011-04/0008.shtml
This commit is contained in:
Daniel Stenberg 2011-04-06 12:03:11 +02:00
parent 1249dd2272
commit f0a37bdadc
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -15,12 +15,14 @@ if test "x$SED" = "xsed-was-not-found-by-configure"; then
fi fi
dnl figure out the libssh2 version dnl figure out the libssh2 version
VERSION=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h` LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_MSG_CHECKING([libssh2 version]) AC_MSG_CHECKING([libssh2 version])
AC_MSG_RESULT($VERSION) AC_MSG_RESULT($LIBSSH2VER)
AB_VERSION=$VERSION AC_SUBST(LIBSSH2VER)
AB_VERSION=$LIBSSH2VER
AB_INIT AB_INIT
@ -289,7 +291,7 @@ AC_OUTPUT
AC_MSG_NOTICE([summary of build options: AC_MSG_NOTICE([summary of build options:
version: ${VERSION} version: ${LIBSSH2VER}
Host type: ${host} Host type: ${host}
Install prefix: ${prefix} Install prefix: ${prefix}
Compiler: ${CC} Compiler: ${CC}

2
libssh2.pc.in
View File

@ -10,7 +10,7 @@ includedir=@includedir@
Name: libssh2 Name: libssh2
URL: http://www.libssh2.org/ URL: http://www.libssh2.org/
Description: Library for SSH based connunication Description: Library for SSH based connunication
Version: @VERSION@ Version: @LIBSSH2VER@
Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@ Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
Libs.private: @LIBS@ Libs.private: @LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}