jfclere     2002/09/12 03:33:45

  Modified:    jk/support jk_apxs.m4
  Log:
  Prevent using --with-apxs2 with apache-1.3 and vice-versa(s).
  
  Revision  Changes    Path
  1.5       +7 -1      jakarta-tomcat-connectors/jk/support/jk_apxs.m4
  
  Index: jk_apxs.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apxs.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_apxs.m4        16 Jun 2002 20:41:33 -0000      1.4
  +++ jk_apxs.m4        12 Sep 2002 10:33:45 -0000      1.5
  @@ -119,11 +119,17 @@
   
               dnl check if we have an apxs for Apache 1.3 or 2.0
               if ${TEST} -z "$APA" ; then
  +           if ${TEST} ! -z "$1" ; then
  +                AC_MSG_ERROR(Do not use --with-apxs$1 but --with-apxs)
  +           fi
                 WEBSERVERS="${WEBSERVERS} server/apache13"
                 RWEBSERVER="apache-1.3"
                 APXS$1_CFLAGS="`${APXS$1} -q CFLAGS`"
                 APXS$1_CPPFLAGS=""
               else
  +           if ${TEST} -z "$1" ; then
  +                AC_MSG_ERROR(Do not use --with-apxs but --with-apxs2)
  +           fi
                 WEBSERVERS="${WEBSERVERS} server/apache2"
                 RWEBSERVER="apache-2.0"
                 APACHE2_CONFIG_VARS=${apache_dir}/build/config_vars.mk
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to