Unverified Commit 5cefe201 authored by Marcel Raad's avatar Marcel Raad
Browse files

configure.ac: ignore CR after version numbers 

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
parent a0576e2f

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ if test -f ${srcdir}/include/curl/curlbuild.h; then 
fi



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_AUTOMAKE

AC_MSG_CHECKING([curl version])
@@ -136,7 +136,7 @@ AC_SUBST(CURLVERSION) 


dnl

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)



dnl Solaris pkgadd support definitions