[cpp-sp] branch main updated: SSPCPP-966 - AC_MSG_ERROR can't be used as value-if-not-found

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=283d7b5cb80ff60c808b9d0034c36e5bc19bab91

The following commit(s) were added to refs/heads/main by this push:
     new 283d7b5c SSPCPP-966 - AC_MSG_ERROR can't be used as value-if-not-found
283d7b5c is described below

commit 283d7b5cb80ff60c808b9d0034c36e5bc19bab91
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 23 08:24:07 2023 -0500

    SSPCPP-966 - AC_MSG_ERROR can't be used as value-if-not-found
    
    https://shibboleth.atlassian.net/browse/SSPCPP-966
---
 configure.ac | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 51bc493f..4a329615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,9 +337,8 @@ if test "$need_default" = "yes"; then
   Peek(with,apxs22,xs="$peekval")
   Peek(with,apxs24,xs="$peekval")
   if test "x$xs" = "x"; then
-     AC_PATH_PROGS(xs, apxs2 apxs,
-        AC_MSG_ERROR(No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.),
-        [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH])
+    AC_PATH_PROGS([xs], [apxs2 apxs],, [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH])
+    AS_IF([test "x$xs" = "x"], [AC_MSG_ERROR([No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.])])
   fi
   # ask the daemon for the version and set parameters
   AC_MSG_CHECKING(default apache version)
@@ -363,10 +362,10 @@ if test "$need_default" = "yes"; then
                [with_apxs24]=$xs
                AC_MSG_RESULT(2.4)
                ;;
-       *)      AC_MSG_ERROR(unusable Apache versions: $v. Try setting --with-apxs, --with=apxs2, etc.)
+       *)      AC_MSG_ERROR([unusable Apache versions: $v. Try setting --with-apxs, --with=apxs2, etc.])
      esac
   else 
-     AC_MSG_RESULT(cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.)
+     AC_MSG_RESULT([cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.])
   fi
 fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.