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, 13 May 2002 23:27:44 GMT
pier        02/05/13 16:27:44

  Modified:    webapp   configure.in
  Log:
  Add ANT support to configure. Note that this is still not reflected
  into the makefiles as of today (will fix it later tomorrow night if
  I get around to do it).
  
  Revision  Changes    Path
  1.59      +54 -3     jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- configure.in	3 May 2002 16:17:55 -0000	1.58
  +++ configure.in	13 May 2002 23:27:43 -0000	1.59
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <mailto:pier@betaversion.org>
  -dnl Version $Id: configure.in,v 1.58 2002/05/03 16:17:55 pier Exp $
  +dnl Version $Id: configure.in,v 1.59 2002/05/13 23:27:43 pier Exp $
   dnl 
   dnl NOTE: close all functions with ]) on the same line otherwise M4 will spit
   dnl       out the last argument of the function with an extra newline.
  @@ -68,6 +68,7 @@
   sinclude(./support/wa_version.m4)
   sinclude(./support/wa_apr.m4)
   sinclude(./support/wa_apxs.m4)
  +sinclude(./support/wa_ant.m4)
   
   dnl --------------------------------------------------------------------------
   dnl Initialize GNU Autoconf (note, this requires autoconf vers. >= 2.52)
  @@ -77,7 +78,6 @@
   AC_CONFIG_AUX_DIR([support])
   AC_CANONICAL_HOST()
   
  -
   dnl --------------------------------------------------------------------------
   dnl Get rid of all that "--prefix" ... "--xxxdir" in the help message
   dnl --------------------------------------------------------------------------
  @@ -89,6 +89,7 @@
   WA_VARIABLE([APR_DIR])
   WA_VARIABLE([SRC_DIR])
   WA_VARIABLE([TGT_DIR])
  +WA_VARIABLE([TC4_DIR])
   WA_PATH_DIR([SRC_DIR],[${srcdir}],[sources])
   WA_PATH_DIR([TGT_DIR],[.],[build])
   
  @@ -100,6 +101,7 @@
   WA_VARIABLE([SHELL])
   WA_VARIABLE([LIBTOOL])
   WA_VARIABLE([APXS])
  +WA_VARIABLE([ANT])
   
   WA_VARIABLE([CPPFLAGS])
   WA_VARIABLE([CFLAGS])
  @@ -123,6 +125,10 @@
   HOST="${host}"
   DATE="`date`"
   
  +WA_VARIABLE([ENABLE_JAVA])
  +WA_VARIABLE([ENABLE_DOCS])
  +WA_VARIABLE([ENABLE_APIJ])
  +
   dnl --------------------------------------------------------------------------
   dnl Figure out if we have APXS, where it's located, and what version it is
   dnl --------------------------------------------------------------------------
  @@ -255,6 +261,51 @@
   WA_VERSION([WEBAPP_VERSION],[${CC}])
   
   dnl --------------------------------------------------------------------------
  +dnl Java Tips and Tricks
  +dnl --------------------------------------------------------------------------
  +WA_ANT([ANT])
  +
  +AC_MSG_CHECKING([for java compilation])
  +AC_ARG_ENABLE(
  +    [java],
  +    [  --enable-java[[=tc4dir]]  compile java code (tc4dir must be specifed)],
  +    [
  +        case "${enableval}" in
  +        ""|"yes"|"YES"|"true"|"TRUE")
  +            WA_ERROR([Path of Tomcat 4.0 binary distribution unspecified])
  +            ;;
  +        "no"|"NO"|"false"|"FALSE")
  +            AC_MSG_RESULT([no])
  +            ENABLE_JAVA=""
  +            ;;
  +        *)
  +            AC_MSG_RESULT([yes])
  +            ENABLE_JAVA="compile"
  +            WA_PATH_DIR([TC4_DIR],[${enableval}],[tomcat 4.0 distribution])
  +            AC_MSG_CHECKING([for proper tomcat layout])
  +            if test ! -f "${TC4_DIR}/server/lib/catalina.jar" ; then
  +              WA_ERROR([cannot find "${TC4_DIR}/server/lib/catalina.jar"])
  +            fi
  +            if test ! -f "${TC4_DIR}/common/lib/servlet.jar" ; then
  +              WA_ERROR([cannot find "${TC4_DIR}/common/lib/servlet.jar"])
  +            fi
  +            AC_MSG_RESULT([ok])
  +            ;;
  +        esac
  +    ],[
  +        AC_MSG_RESULT([no])
  +        ENABLE_JAVA=""
  +    ])
  +
  +dnl --------------------------------------------------------------------------
   dnl All done
   dnl --------------------------------------------------------------------------
  -AC_OUTPUT([Makedefs Makefile lib/Makefile ${MODULE}/Makefile DETAILS.txt])
  +AC_OUTPUT(
  +  [
  +    Makedefs
  +    Makefile
  +    lib/Makefile
  +    ${MODULE}/Makefile
  +    DETAILS.txt
  +    build.properties
  +  ])
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message