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 Mon, 17 Sep 2001 05:07:01 GMT
pier        01/09/16 22:07:01

  Modified:    webapp   configure.in
  Log:
  Discover configure generated files as we process.
  
  Revision  Changes    Path
  1.39      +56 -44    jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- configure.in	2001/09/17 00:42:59	1.38
  +++ configure.in	2001/09/17 05:07:01	1.39
  @@ -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.38 2001/09/17 00:42:59 pier Exp $
  +dnl Version $Id: configure.in,v 1.39 2001/09/17 05:07:01 pier Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -78,12 +78,13 @@
   dnl --------------------------------------------------------------------------
   dnl Setup initial variable value
   dnl
  -dnl New vars: MODULE TARGET
  +dnl New vars: MODULE TARGET CFGFILES
   dnl           APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
   dnl Upd vars: N/A
   dnl --------------------------------------------------------------------------
   MODULE=""
   TARGET="lib"
  +CFGFILES="./Makefile ./Makedefs ./lib/Makefile ./java/Constants.java"
   APR_CFGFLG=""
   APR_SRCDIR=""
   APR_LIBDIR=""
  @@ -92,6 +93,7 @@
   
   AC_SUBST(MODULE)
   AC_SUBST(TARGET)
  +AC_SUBST(CFGFILES)
   AC_SUBST(APR_CFGFLG)
   AC_SUBST(APR_SRCDIR)
   AC_SUBST(APR_LIBDIR)
  @@ -124,7 +126,9 @@
   AC_SUBST(AR)
   AC_SUBST(RANLIB)
   AC_PROG_CC()
  -LOCAL_CHECK_PROG(CC,${CC})
  +local_cc="${CC}"
  +LOCAL_CHECK_PROG(CC,"${local_cc}")
  +unset local_cc
   AC_PROG_CC_C_O()
   AC_PROG_CPP()
   AC_SUBST(CPPFLAGS)
  @@ -191,6 +195,42 @@
   )
   AC_SUBST(TC4DIR)
   
  +dnl --------------------------------------------------------------------------
  +dnl Check that we can build all classes depending on Tomcat if Java is enabled
  +dnl
  +dnl New vars: CLASSPATH
  +dnl Upd vars: TC4DIR TARGET CFGFILES
  +dnl --------------------------------------------------------------------------
  +if ${TEST} "$JAVA_ENABLE" = "true"
  +then
  +  LOCAL_RESOLVEDIR(TC4DIR,"${TC4DIR}",[tomcat distribution directory])
  +  
  +  if ${TEST} ! -f "${TC4DIR}/common/lib/servlet.jar"
  +  then
  +    AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \"${TC4DIR}\"])
  +  fi
  +
  +  if ${TEST} ! -f "${TC4DIR}/server/lib/catalina.jar"
  +  then
  +    AC_MSG_ERROR([Cannot find Catalina jar in \"${TC4DIR}\"])
  +  fi
  +
  +  if ${TEST} -z "${CLASSPATH}"
  +  then
  +    CLASSPATH="${TC4DIR}/common/lib/servlet.jar"
  +  else
  +    CLASSPATH="${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar"
  +  fi
  +  CLASSPATH="${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar"
  +
  +  TARGET="${TARGET} java"
  +  CFGFILES="${CFGFILES} ./java/Makefile"
  +else
  +  CLASSPATH=""
  +  TC4DIR=""
  +fi
  +AC_SUBST(CLASSPATH)
  +
   dnl -------------------------------------------------------------------------
   dnl Check wether we have to build the C API documentation or not
   dnl
  @@ -296,41 +336,6 @@
   )
   
   dnl --------------------------------------------------------------------------
  -dnl Check that we can build all classes depending on Tomcat if Java is enabled
  -dnl
  -dnl New vars: CLASSPATH
  -dnl Upd vars: TC4DIR TARGET
  -dnl --------------------------------------------------------------------------
  -if ${TEST} "$JAVA_ENABLE" = "true"
  -then
  -  LOCAL_RESOLVEDIR(TC4DIR,"${TC4DIR}",[tomcat distribution directory])
  -  
  -  if ${TEST} ! -f "${TC4DIR}/common/lib/servlet.jar"
  -  then
  -    AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \"${TC4DIR}\"])
  -  fi
  -
  -  if ${TEST} ! -f "${TC4DIR}/server/lib/catalina.jar"
  -  then
  -    AC_MSG_ERROR([Cannot find Catalina jar in \"${TC4DIR}\"])
  -  fi
  -
  -  if ${TEST} -z "${CLASSPATH}"
  -  then
  -    CLASSPATH="${TC4DIR}/common/lib/servlet.jar"
  -  else
  -    CLASSPATH="${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar"
  -  fi
  -  CLASSPATH="${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar"
  -
  -  TARGET="${TARGET} java"
  -else
  -  CLASSPATH=""
  -  TC4DIR=""
  -fi
  -AC_SUBST(CLASSPATH)
  -
  -dnl --------------------------------------------------------------------------
   dnl Process the --with-apr=... command line argument
   dnl
   dnl   This is always processed, and sets the APR_SRCDIR variable. After this
  @@ -449,6 +454,9 @@
   
   dnl --------------------------------------------------------------------------
   dnl Was a module specified?
  +dnl
  +dnl New vars: N/A
  +dnl Upd vars: CFGFILES
   dnl --------------------------------------------------------------------------
   AC_MSG_CHECKING([target module])
   
  @@ -458,6 +466,7 @@
     AC_MSG_ERROR([No target module specified])
   fi
   AC_MSG_RESULT([${MODULE}])
  +CFGFILES="${CFGFILES} ./${MODULE}/Makefile"
   
   dnl --------------------------------------------------------------------------
   dnl Configure the APR source distribution
  @@ -538,7 +547,7 @@
   dnl --------------------------------------------------------------------------
   dnl Set up targets for building and cleaning
   dnl
  -dnl New vars: TARGET_BUILD TARGET_CLEAN
  +dnl New vars: TARGET_BUILD TARGET_CLEAN TARGET_LBUILD TARGET_LCLEAN
   dnl Upd vars: N/A
   dnl --------------------------------------------------------------------------
   AC_MSG_CHECKING([for Makefile targets])
  @@ -548,22 +557,25 @@
   do
     TARGET_BUILD="${TARGET_BUILD} ${local_target}-build"
     TARGET_CLEAN="${TARGET_CLEAN} ${local_target}-clean"
  +  if ${TEST} ! "${local_target}" = "apr"
  +  then
  +    TARGET_LBUILD="${TARGET_LBUILD} ${local_target}-build"
  +    TARGET_LCLEAN="${TARGET_LCLEAN} ${local_target}-clean"
  +  fi
   done
   unset local_target
   TARGET_BUILD="${TARGET_BUILD} ${MODULE}-build"
   TARGET_CLEAN="${TARGET_CLEAN} ${MODULE}-clean"
  +TARGET_LBUILD="${TARGET_BUILD} ${MODULE}-build"
  +TARGET_LCLEAN="${TARGET_CLEAN} ${MODULE}-clean"
   AC_MSG_RESULT([${TARGET} ${MODULE}])
   AC_SUBST(TARGET_BUILD)
   AC_SUBST(TARGET_CLEAN)
  +AC_SUBST(TARGET_LBUILD)
  +AC_SUBST(TARGET_LCLEAN)
   
   dnl --------------------------------------------------------------------------
   dnl Finish up
  -dnl
  -dnl New vars: CFGFILES
  -dnl Upd vars: N/A
   dnl --------------------------------------------------------------------------
  -CFGFILES="./Makefile ./Makedefs ./lib/Makefile"
  -CFGFILES="${CFGFILES} ./${MODULE}/Makefile ./java/Constants.java"
  -AC_SUBST(CFGFILES)
   AC_OUTPUT(${CFGFILES})
   LOCAL_HEADER([All done. Now you can issue \"make\". Good luck.])
  
  
  

Mime
View raw message