tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 Makefile.in
Date Wed, 05 Sep 2001 11:05:47 GMT
jfclere     01/09/05 04:05:47

  Modified:    webapp   Makefile.in configure.in
               webapp/apache-1.3 Makefile.in
  Log:
  Commit Ryan's patches for the configure/Makefile.
  Arrange install of mod_webapp.so apache-1.3 (The script what installed).
  
  Revision  Changes    Path
  1.17      +3 -3      jakarta-tomcat-connectors/webapp/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.in	2001/08/31 10:26:24	1.16
  +++ Makefile.in	2001/09/05 11:05:47	1.17
  @@ -56,7 +56,7 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  -# @version $Id: Makefile.in,v 1.16 2001/08/31 10:26:24 jfclere Exp $
  +# @version $Id: Makefile.in,v 1.17 2001/09/05 11:05:47 jfclere Exp $
   
   include @SRCDIR@/Makedefs
   
  @@ -70,11 +70,11 @@
   	config.log \
   	config.status
   
  -all: apr-all local-all
  +all: @APR_BUILD@ local-all
   
   install: local-install
   
  -clean: apr-clean local-clean
  +clean: @APR_CLEAN@ local-clean
   
   distclean: clean
   	@$(ECHO) ""
  
  
  
  1.26      +64 -38    jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- configure.in	2001/09/03 12:58:31	1.25
  +++ configure.in	2001/09/05 11:05:47	1.26
  @@ -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.25 2001/09/03 12:58:31 jfclere Exp $
  +dnl Version $Id: configure.in,v 1.26 2001/09/05 11:05:47 jfclere Exp $
   dnl --------------------------------------------------------------------------
   
   dnl --------------------------------------------------------------------------
  @@ -213,15 +213,21 @@
            AC_MSG_ERROR([${APXS} do not seem a valid apxs)]) 
         fi
         TARGET="${SRCDIR}/apache-1.3"
  +      APR_BUILD="apr-all"
  +      APR_CLEAN="apr-clean"
         makefile="apache-1.3/Makefile"
       else
         TARGET="${SRCDIR}/apache-2.0"
  +      APR_BUILD=""
  +      APR_CLEAN=""
         makefile="apache-2.0/Makefile"
       fi
       AC_MSG_RESULT([setting target module to... ${TARGET}])
     ]
   )
   AC_SUBST(TARGET)
  +AC_SUBST(APR_BUILD)
  +AC_SUBST(APR_CLEAN)
   
   dnl --------------------------------------------------------------------------
   dnl Process the --with-apr=... command line argument
  @@ -229,47 +235,57 @@
   AC_MSG_CHECKING([APR directory])
   AC_ARG_WITH(apr,
     [  --with-apr=DIR          where the APR sources can be found.],
  -  APRDIR="${withval}",
  -  APRDIR="${SRCDIR}/apr"
  +  APRDIR="${withval}"
   )
   
  -if ${TEST} ! -d "${APRDIR}" ; then
  -  AC_MSG_ERROR([Cannot find APR sources directory \"${APRDIR}\"])
  +if ${TEST} -z "${APA}" -a -z "${APRDIR}" ; then
  +  APRDIR="{SRCDIR}/apr"
  +else
  +  APRDIR="${APXS_PREFIX}"
   fi
   
  -if ${TEST} ! -x "${APRDIR}/buildconf" ; then
  -  AC_MSG_ERROR([Cannot find APR buildconf program in \"${APRDIR}\"])
  -fi
  +if ${TEST} -z "${APA}" ; then
  +  if ${TEST} ! -d "${APRDIR}" ; then
  +    AC_MSG_ERROR([Cannot find APR sources directory \"${APRDIR}\"])
  +  fi
   
  -curdir=`pwd`
  -cd ${APRDIR}
  -APRDIR=`pwd`
  -AC_MSG_RESULT([${APRDIR}])
  -cd ${curdir}
  -AC_SUBST(APRDIR)
  +  if ${TEST} ! -x "${APRDIR}/buildconf" ; then
  +    AC_MSG_ERROR([Cannot find APR buildconf program in \"${APRDIR}\"])
  +  fi
   
  -dnl --------------------------------------------------------------------------
  -dnl Build the configure script for APR and run it
  -dnl --------------------------------------------------------------------------
  -curdir=`pwd`
  -cd ${APRDIR}
  +  curdir=`pwd`
  +  cd ${APRDIR}
  +  APRDIR=`pwd`
  +  AC_MSG_RESULT([${APRDIR}])
  +  cd ${curdir}
  +  AC_SUBST(APRDIR)
   
  -LOCAL_HEADER([Building APR configure script])
  -LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
  -if ${TEST} "${ret}" -ne "0"
  -then
  -  AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
  -fi
  +  dnl --------------------------------------------------------------------------
  +  dnl Build the configure script for APR and run it
  +  dnl --------------------------------------------------------------------------
  +  curdir=`pwd`
  +  cd ${APRDIR}
   
  -LOCAL_HEADER([Configuring APR])
  -LOCAL_FILTEREXEC(
  -  [./configure --enable-static --disable-threads],
  -  ["APR configure"])
  -if ${TEST} "${ret}" -ne "0"
  -then
  -  AC_MSG_ERROR([APR configure script terminated with error code ${ret}])
  +  LOCAL_HEADER([Building APR configure script])
  +  LOCAL_FILTEREXEC([./buildconf],[APR buildconf])
  +  if ${TEST} "${ret}" -ne "0"
  +  then
  +    AC_MSG_ERROR([APR buildconf terminated with error code ${ret}])
  +  fi
  +
  +  dnl the --disable-shared prevent building shared libraries.
  +  LOCAL_HEADER([Configuring APR])
  +  LOCAL_FILTEREXEC(
  +    [./configure --enable-static --disable-shared --disable-threads],
  +    ["APR configure"])
  +  if ${TEST} "${ret}" -ne "0"
  +  then
  +    AC_MSG_ERROR([APR configure script terminated with error code ${ret}])
  +  fi
  +  cd ${curdir}
  +else
  +  AC_MSG_RESULT(Using APR from Apache build)
   fi
  -cd ${curdir}
   
   dnl --------------------------------------------------------------------------
   dnl Retrieving APR default values
  @@ -278,19 +294,29 @@
   
   if ${TEST} ! -f ${APRDIR}/APRVARS
   then
  -  AC_MSG_RESULT([error])
  -  AC_MSG_ERROR([Cannot find APR defaults in ${APRDIR}/APRVARS])
  +  if ${TEST} "${APA}" ; then
  +    LIBDIR="/lib"
  +  else
  +    AC_MSG_RESULT([error])
  +    AC_MSG_ERROR([Cannot find APR defaults in ${APRDIR}/APRVARS])
  +  fi
  +else
  +  LIBDIR=""
   fi
   
   if ${TEST} ! -x ${APRDIR}/libtool
   then
  -  AC_MSG_RESULT([error])
  -  AC_MSG_ERROR([Cannot find APR libtool binary])
  +  if ${TEST} "${APA}" ; then
  +    LIBTOOL="${APXS_PREFIX}/build/libtool"
  +  else
  +    AC_MSG_RESULT([error])
  +    AC_MSG_ERROR([Cannot find APR libtool binary])
  +  fi
   else
     LIBTOOL="${APRDIR}/libtool"
   fi
   
  -eval `cat ${APRDIR}/APRVARS`
  +eval `cat ${APRDIR}${LIBDIR}/APRVARS`
   AC_SUBST(CC)
   AC_SUBST(CPP)
   AC_SUBST(SHELL)
  
  
  
  1.11      +3 -2      jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2001/08/31 10:26:24	1.10
  +++ Makefile.in	2001/09/05 11:05:47	1.11
  @@ -56,7 +56,7 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  -# @version $Id: Makefile.in,v 1.10 2001/08/31 10:26:24 jfclere Exp $
  +# @version $Id: Makefile.in,v 1.11 2001/09/05 11:05:47 jfclere Exp $
   
   include @SRCDIR@/Makedefs
   
  @@ -96,7 +96,8 @@
   		-o mod_webapp.so
   
   install: mod_webapp.so
  -	$(APXS) -i mod_webapp.so
  +	@$(ECHO) Installing Apache 1.3 WebApp Module
  +	@$(SHELL) $(LIBTOOL)  --mode=install cp $(MODULE) $(APXS_LIBEXECDIR)
   
   clean:
   	@for ENTRY in *.o *.lo $(MODULE) .libs ; \
  
  
  

Mime
View raw message