httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2 acinclude.m4
Date Fri, 06 Aug 2004 22:30:37 GMT
joes        2004/08/06 15:30:37

  Modified:    .        acinclude.m4
  Log:
  Support ap[ru]-1-config via apxs
  
  Revision  Changes    Path
  1.29      +9 -2      httpd-apreq-2/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- acinclude.m4	16 Jul 2004 20:27:02 -0000	1.28
  +++ acinclude.m4	6 Aug 2004 22:30:36 -0000	1.29
  @@ -36,8 +36,15 @@
           else
                   APACHE2_INCLUDES=-I`$APACHE2_APXS -q INCLUDEDIR`
                   APACHE2_HTTPD=`$APACHE2_APXS -q SBINDIR`/httpd
  -                APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/apr-config
  -                APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/apu-config
  +                if test -z "`$APACHE2_APXS -q APR_VERSION`"; then
  +                    APR_CONFIG=apr-config
  +                    APU_CONFIG=apu-config 
  +                else
  +                    APR_CONFIG=apr-1-config
  +                    APU_CONFIG=apu-1-config
  +                fi
  +                APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/$APR_CONFIG
  +                APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/$APU_CONFIG
   
                   if test -z "`$prereq_check apache2 $APACHE2_HTTPD`"; then
                       AC_MSG_ERROR([Bad apache2 version])
  
  
  

Mime
View raw message