httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From soc-r...@apache.org
Subject svn commit: r232406 - in /httpd/mod_smtpd/trunk: configure configure.ac
Date Fri, 12 Aug 2005 23:57:02 GMT
Author: soc-rian
Date: Fri Aug 12 16:56:59 2005
New Revision: 232406

URL: http://svn.apache.org/viewcvs?rev=232406&view=rev
Log:
More robuse apache version checking in configure

Modified:
    httpd/mod_smtpd/trunk/configure
    httpd/mod_smtpd/trunk/configure.ac

Modified: httpd/mod_smtpd/trunk/configure
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/configure?rev=232406&r1=232405&r2=232406&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/configure (original)
+++ httpd/mod_smtpd/trunk/configure Fri Aug 12 16:56:59 2005
@@ -1304,9 +1304,10 @@
 	fi
 
 
-	min_apache_version=2.0
+	min_apache_version=2.0.56
 	AP_BIN=`$APXS_BIN -q BINDIR`
-	our_apache_version=`$AP_BIN/httpd -v | grep version | tr -dc ^0-9.`
+	our_apache_version=`$AP_BIN/httpd -v | grep -i Apache |
+			    sed -e 's/.*Apache\///' | tr -dc ^0-9.`
 
 	echo "$as_me:$LINENO: checking for Apache version >= $min_apache_version" >&5
 echo $ECHO_N "checking for Apache version >= $min_apache_version... $ECHO_C" >&6

Modified: httpd/mod_smtpd/trunk/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/configure.ac?rev=232406&r1=232405&r2=232406&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/configure.ac (original)
+++ httpd/mod_smtpd/trunk/configure.ac Fri Aug 12 16:56:59 2005
@@ -4,7 +4,8 @@
 AC_DEFUN([CHECK_VERSION],[dnl
 	min_apache_version=ifelse([$1], ,no,$1)
 	AP_BIN=`$APXS_BIN -q BINDIR`
-	our_apache_version=`$AP_BIN/httpd -v | grep version | tr -dc [^0-9.]`
+	our_apache_version=`$AP_BIN/httpd -v | grep -i Apache |
+			    sed -e 's/.*Apache\///' | tr -dc [^0-9.]`
 
 	AC_MSG_CHECKING(for Apache version >= $min_apache_version)
 	



Mime
View raw message