Skip to content

Commit a830ef6

Browse files
authored
Merge pull request #2894 from martinhsv/v3/master
Configure: use AS_ECHO_N instead echo -n
2 parents 6fc270e + 8d62ac4 commit a830ef6

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
v3.x.y - YYYY-MMM-DD (to be released)
22
-------------------------------------
3+
- Configure: use AS_ECHO_N instead echo -n
4+
[Issue #2894 - @liudongmiao, @martinhsv]
35
- Adjust position of memset from 2890
46
[Issue #2891 - @mirkodziadzka-avi, @martinhsv]
57
- Add test: empty lines in ipMatchFromFile test

configure.ac

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,9 @@ echo " "
424424
echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
425425
echo " "
426426
echo " Mandatory dependencies"
427-
echo -n " + libInjection ...."
427+
AS_ECHO_N(" + libInjection ....")
428428
echo LIBINJECTION_VERSION
429-
echo -n " + SecLang tests ...."
429+
AS_ECHO_N(" + SecLang tests ....")
430430
echo SECLANG_TEST_VERSION
431431

432432
echo " "
@@ -439,7 +439,7 @@ if test "x$GEOIP_FOUND" = "x0" && test "x$MAXMIND_FOUND" = "x0"; then
439439
echo " + GeoIP/MaxMind ....not found"
440440
fi
441441
if test "x$GEOIP_FOUND" = "x1" || test "x$MAXMIND_FOUND" = "x1"; then
442-
echo -n " + GeoIP/MaxMind ....found "
442+
AS_ECHO_N(" + GeoIP/MaxMind ....found ")
443443
echo ""
444444
if test "x$MAXMIND_FOUND" = "x1"; then
445445
echo " * (MaxMind) v${MAXMIND_VERSION}"
@@ -460,7 +460,7 @@ if test "x$CURL_FOUND" = "x0"; then
460460
echo " + LibCURL ....not found"
461461
fi
462462
if test "x$CURL_FOUND" = "x1"; then
463-
echo -n " + LibCURL ....found "
463+
AS_ECHO_N(" + LibCURL ....found ")
464464
if ! test "x$CURL_VERSION" = "x"; then
465465
echo "v${CURL_VERSION}"
466466
else
@@ -478,7 +478,7 @@ if test "x$YAJL_FOUND" = "x0"; then
478478
echo " + YAJL ....not found"
479479
fi
480480
if test "x$YAJL_FOUND" = "x1"; then
481-
echo -n " + YAJL ....found "
481+
AS_ECHO_N(" + YAJL ....found ")
482482
if ! test "x$YAJL_VERSION" = "x"; then
483483
echo "v${YAJL_VERSION}"
484484
else
@@ -496,7 +496,7 @@ if test "x$LMDB_FOUND" = "x0"; then
496496
echo " + LMDB ....not found"
497497
fi
498498
if test "x$LMDB_FOUND" = "x1"; then
499-
echo -n " + LMDB ....found "
499+
AS_ECHO_N(" + LMDB ....found ")
500500
if ! test "x$LMDB_VERSION" = "x"; then
501501
echo "v${LMDB_VERSION}"
502502
else
@@ -514,7 +514,7 @@ if test "x$LIBXML2_FOUND" = "x0"; then
514514
echo " + LibXML2 ....not found"
515515
fi
516516
if test "x$LIBXML2_FOUND" = "x1"; then
517-
echo -n " + LibXML2 ....found "
517+
AS_ECHO_N(" + LibXML2 ....found ")
518518
if ! test "x$LIBXML2_VERSION" = "x"; then
519519
echo "v${LIBXML2_VERSION}"
520520
else
@@ -532,7 +532,7 @@ if test "x$SSDEEP_FOUND" = "x0"; then
532532
echo " + SSDEEP ....not found"
533533
fi
534534
if test "x$SSDEEP_FOUND" = "x1"; then
535-
echo -n " + SSDEEP ....found "
535+
AS_ECHO_N(" + SSDEEP ....found ")
536536
if ! test "x$SSDEEP_VERSION" = "x"; then
537537
echo "v${SSDEEP_VERSION}"
538538
else
@@ -549,7 +549,7 @@ if test "x$LUA_FOUND" = "x0"; then
549549
echo " + LUA ....not found"
550550
fi
551551
if test "x$LUA_FOUND" = "x1"; then
552-
echo -n " + LUA ....found "
552+
AS_ECHO_N(" + LUA ....found ")
553553
if ! test "x$LUA_VERSION" = "x"; then
554554
echo "v${LUA_VERSION}"
555555
else
@@ -567,7 +567,7 @@ if test "x$PCRE2_FOUND" = "x0"; then
567567
echo " + PCRE2 ....not found"
568568
fi
569569
if test "x$PCRE2_FOUND" = "x1"; then
570-
echo -n " + PCRE2 ....found "
570+
AS_ECHO_N(" + PCRE2 ....found ")
571571
if ! test "x$PCRE2_VERSION" = "x"; then
572572
echo "v${PCRE2_VERSION}"
573573
else

0 commit comments

Comments
 (0)