diff options
| author | Marcel Raad <raad@teamviewer.com> | 2017-04-15 08:32:23 +0200 |
|---|---|---|
| committer | Marcel Raad <raad@teamviewer.com> | 2017-04-17 08:32:45 +0200 |
| commit | 5cefe201e924867f7b6e078a6c5fdce013bb510b (patch) | |
| tree | 798f1af2851d79fb63ea34698b69e6bd04ed460a | |
| parent | a0576e2f362bc1a1adee22c924ce33710a69559f (diff) | |
| download | curl-5cefe201e924867f7b6e078a6c5fdce013bb510b.tar.gz | |
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
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index abd0def36..b492a29a5 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |