tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp configure.in
Date Fri, 14 Sep 2001 23:52:19 GMT
pier        01/09/14 16:52:19

  Modified:    webapp   configure.in
  Log:
  Modified configure.in to use what has been modified/added in aplocal.m4
  
  Revision  Changes    Path
  1.30      +10 -9     jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- configure.in	2001/09/14 02:36:02	1.29
  +++ configure.in	2001/09/14 23:52:19	1.30
  @@ -58,7 +58,7 @@
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
   dnl Author Jon S. Stevens <mailto:jon@latchkey.com>
  -dnl Version $Id: configure.in,v 1.29 2001/09/14 02:36:02 pier Exp $
  +dnl Version $Id: configure.in,v 1.30 2001/09/14 23:52:19 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -89,8 +89,7 @@
   dnl --------------------------------------------------------------------------
   dnl Check where sources are
   dnl --------------------------------------------------------------------------
  -LOCAL_RESOLVEDIR([${srcdir}],[sources directory])
  -SRCDIR=${DIR}
  +LOCAL_RESOLVEDIR(SRCDIR,[${srcdir}],[sources directory])
   
   dnl -------------------------------------------------------------------------
   dnl Check C environment
  @@ -100,10 +99,11 @@
   dnl   compiler is not available.
   dnl -------------------------------------------------------------------------
   LOCAL_HEADER([C-Language compilation tools])
  +LOCAL_CHECK_PROG(AR,ar)
  +LOCAL_CHECK_PROG(RANLIB,ranlib)
   AC_PROG_CC()
  +AC_PROG_CC_C_O()
   AC_PROG_CPP()
  -AC_PATH_PROG(AR,ar,${PATH})
  -AC_PATH_PROG(RANLIB,ranlib,${PATH})
   AC_SUBST(AR)
   AC_SUBST(RANLIB)
   
  @@ -219,8 +219,7 @@
       AC_MSG_ERROR([Cannot find APR buildconf program in \"${APR_SRCDIR}\"])
     fi
     
  -  LOCAL_RESOLVEDIR([${APR_SRCDIR}],[full APR directory path])
  -  APR_SRCDIR="${DIR}"
  +  LOCAL_RESOLVEDIR(APR_SRCDIR,[${APR_SRCDIR}],[full APR directory path])
     
     dnl ---------------------------------------------
     dnl Build the configure script for APR and run it
  @@ -230,14 +229,16 @@
     cd ${APR_SRCDIR}
     
     LOCAL_HEADER([Building APR configure script])
  -  LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
  +  LOCAL_FILTEREXEC(ret,
  +    [./buildconf],
  +    [APR buildconf])
     if ${TEST} "${ret}" -ne "0"
     then
       AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
     fi
     
     LOCAL_HEADER([Configuring APR])
  -  LOCAL_FILTEREXEC(
  +  LOCAL_FILTEREXEC(ret,
       [./configure --enable-static --disable-shared --disable-threads],
       ["APR configure"])
     if ${TEST} "${ret}" -ne "0"
  
  
  

Mime
View raw message