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 Tue, 14 May 2002 00:21:17 GMT
pier        02/05/13 17:21:17

  Modified:    webapp   configure.in
  Log:
  Simplify --enable-java, add targets for --enable-docs and --enable-apidoc-java
  
  Revision  Changes    Path
  1.60      +67 -0     jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- configure.in	13 May 2002 23:27:43 -0000	1.59
  +++ configure.in	14 May 2002 00:21:17 -0000	1.60
  @@ -57,7 +57,7 @@
   
   dnl --------------------------------------------------------------------------
   dnl Author Pier Fumagalli <mailto:pier@betaversion.org>
  -dnl Version $Id: configure.in,v 1.59 2002/05/13 23:27:43 pier Exp $
  +dnl Version $Id: configure.in,v 1.60 2002/05/14 00:21:17 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.
  @@ -264,6 +264,10 @@
   dnl Java Tips and Tricks
   dnl --------------------------------------------------------------------------
   WA_ANT([ANT])
  +if test -n "${ANT}" ; then
  +    WA_APPEND([EXTRA_BUILD],[ant-build])
  +dnl    WA_APPEND([EXTRA_CLEAN],[ant-clean])
  +fi
   
   AC_MSG_CHECKING([for java compilation])
   AC_ARG_ENABLE(
  @@ -279,6 +283,9 @@
               ENABLE_JAVA=""
               ;;
           *)
  +            if test -z "${ANT}" ; then
  +                WA_ERROR([java compilation desired but ANT not found])
  +            fi
               AC_MSG_RESULT([yes])
               ENABLE_JAVA="compile"
               WA_PATH_DIR([TC4_DIR],[${enableval}],[tomcat 4.0 distribution])
  @@ -295,6 +302,66 @@
       ],[
           AC_MSG_RESULT([no])
           ENABLE_JAVA=""
  +    ])
  +
  +AC_MSG_CHECKING([for documentation generation])
  +AC_ARG_ENABLE(
  +    [docs],
  +    [  --enable-docs           generate documentation (requires ANT)],
  +    [
  +        case "${enableval}" in
  +        ""|"yes"|"YES"|"true"|"TRUE")
  +            if test -z "${ANT}" ; then
  +                WA_ERROR([docs generation desired but ANT not found])
  +            fi
  +            AC_MSG_RESULT([yes])
  +            ENABLE_DOCS="docs"
  +            ;;
  +        "no"|"NO"|"false"|"FALSE")
  +            AC_MSG_RESULT([no])
  +            ENABLE_DOCS=""
  +            ;;
  +        *)
  +            WA_ERROR([invalid parameter --enable-docs="${enableval}"])
  +            ;;
  +        esac
  +    ],[
  +        if test -z "${ANT}" ; then
  +            AC_MSG_RESULT([no (ant required)])
  +        else
  +            AC_MSG_RESULT([yes (ant detected)])
  +            ENABLE_DOCS="docs"
  +        fi
  +    ])
  +
  +AC_MSG_CHECKING([for Java API docs generation])
  +AC_ARG_ENABLE(
  +    [apidoc-java],
  +    [  --enable-apidoc-java    generate Java API docs (requires ANT)],
  +    [
  +        case "${enableval}" in
  +        ""|"yes"|"YES"|"true"|"TRUE")
  +            if test -z "${ANT}" ; then
  +                WA_ERROR([docs generation desired but ANT not found])
  +            fi
  +            AC_MSG_RESULT([yes])
  +            ENABLE_APIJ="javadoc"
  +            ;;
  +        "no"|"NO"|"false"|"FALSE")
  +            AC_MSG_RESULT([no])
  +            ENABLE_APIJ=""
  +            ;;
  +        *)
  +            WA_ERROR([invalid parameter --enable-apidoc-java="${enableval}"])
  +            ;;
  +        esac
  +    ],[
  +        if test -z "${ANT}" ; then
  +            AC_MSG_RESULT([no (ant required)])
  +        else
  +            AC_MSG_RESULT([yes (ant detected)])
  +            ENABLE_APIJ="javadoc"
  +        fi
       ])
   
   dnl --------------------------------------------------------------------------
  
  
  

--
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