moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-10-31 15:45:12 -04:00
Code Issues Releases Wiki Activity

configure.ac: ignore CR after version numbers

Browse Source 
Ignore everything after the version numbers in LIBCURL_VERSION and
LIBCURL_VERSION_NUM to ged rid of the extra CR character.
This makes tests 1022 and 1023 pass on Linux with a CRLF checkout.

Ref: https://github.com/curl/curl/pull/1344#issuecomment-289243166
Closes https://github.com/curl/curl/pull/1422
This commit is contained in:
Marcel Raad 2017-04-15 08:32:23 +02:00
parent a0576e2f36
commit 5cefe201e9
No known key found for this signature in database
GPG Key ID: B4668817AE6D6CD4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -126,7 +126,7 @@ if test -f ${srcdir}/include/curl/curlbuild.h; then
fi fi
dnl figure out the libcurl version dnl figure out the libcurl version
CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h` CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h`
XC_CHECK_PROG_CC XC_CHECK_PROG_CC
XC_AUTOMAKE XC_AUTOMAKE
AC_MSG_CHECKING([curl version]) AC_MSG_CHECKING([curl version])
@ -136,7 +136,7 @@ AC_SUBST(CURLVERSION)
dnl dnl
dnl we extract the numerical version for curl-config only dnl we extract the numerical version for curl-config only
VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curlver.h` VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/curl/curlver.h`
AC_SUBST(VERSIONNUM) AC_SUBST(VERSIONNUM)
dnl Solaris pkgadd support definitions dnl Solaris pkgadd support definitions