[libsoup] tests: fix "make check" with partial apache install



commit 8baffb50a40fa913cb04f171fadb4234c596cea5
Author: Dan Winship <danw gnome org>
Date:   Sat Feb 28 09:12:14 2015 -0500

    tests: fix "make check" with partial apache install
    
    If you had apache installed, but not mod_ssl, then "make check" would
    fail.

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e7c832a..2d3dd52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,8 +262,8 @@ else
     have_apache=0
 fi
 AM_CONDITIONAL(HAVE_APACHE, test "$have_apache" = 1)
-AM_CONDITIONAL(HAVE_APACHE_2_2, test "$apache_version" = 2.2)
-AM_CONDITIONAL(HAVE_APACHE_2_4, test "$apache_version" = 2.4)
+AM_CONDITIONAL(HAVE_APACHE_2_2, test "$have_apache" = 1 -a "$apache_version" = 2.2)
+AM_CONDITIONAL(HAVE_APACHE_2_4, test "$have_apache" = 1 -a "$apache_version" = 2.4)
 
 if test "$have_apache" = 1; then
     AC_CHECK_PROGS(PHP, php php5)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]