pier 01/08/06 15:21:52 Modified: webapp Makefile.in configure.in Log: Finishing touch to build process. Re-enabling APR configure calls and modified global Makefile to use the right discovered binaries. Revision Changes Path 1.15 +28 -26 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 2001/08/06 02:47:21 1.14 +++ Makefile.in 2001/08/06 22:21:52 1.15 @@ -56,7 +56,7 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makefile.in,v 1.14 2001/08/06 02:47:21 pier Exp $ +# @version $Id: Makefile.in,v 1.15 2001/08/06 22:21:52 pier Exp $ include @SRCDIR@/Makedefs @@ -64,7 +64,7 @@ APRDIR = @APRDIR@ CFGS = @CONFIGFILES@ \ - ./lib/pr_warp_defs.h \ + @SRCDIR@/lib/pr_warp_defs.h \ config.cache \ config.log \ config.status @@ -74,61 +74,63 @@ clean: apr-clean local-clean distclean: clean - @echo Removing configure generated files... - @rm -f $(CFGS) + @$(ECHO) "" + @$(ECHO) Removing configure generated files... + @$(RM) -f $(CFGS) cvsclean: distclean - @echo Removing configure script... - @rm -f configure + @$(ECHO) "" + @$(ECHO) Removing configure script... + @$(ECHO) -f configure apr-all: @for DIR in $(APRDIR) ; do \ - echo "" ; \ - echo "Compiling sources in $$DIR..." ; \ - cd $$DIR ; \ + $(ECHO) "" ; \ + $(ECHO) "Compiling sources in $${DIR}..." ; \ + cd $${DIR} ; \ $(MAKE) all ; \ RET=$$? ; \ cd $(SRCDIR) ; \ - if test "$$RET" != "0" ; then \ - exit $$RET ; \ + if $(TEST) "$${RET}" != "0" ; then \ + exit $${RET} ; \ fi ; \ done apr-clean: @for DIR in $(APRDIR) ; do \ - echo "" ; \ - echo "Cleaning up $$DIR..." ; \ - cd $$DIR ; \ + $(ECHO) "" ; \ + $(ECHO) "Cleaning up $${DIR}..." ; \ + cd $${DIR} ; \ $(MAKE) clean ; \ RET=$$? ; \ cd $(SRCDIR) ; \ - if test "$$RET" != "0" ; then \ - exit $$RET ; \ + if test "$${RET}" != "0" ; then \ + exit $${RET} ; \ fi ; \ done local-all: @for DIR in $(LOCALDIRS) ; do \ - echo "" ; \ - echo "Compiling sources in $$DIR..." ; \ - cd $$DIR ; \ + $(ECHO) "" ; \ + $(ECHO) "Compiling sources in $${DIR}..." ; \ + cd $${DIR} ; \ $(MAKE) all ; \ RET=$$? ; \ cd $(SRCDIR) ; \ - if test "$$RET" != "0" ; then \ - exit $$RET ; \ + if test "$${RET}" != "0" ; then \ + exit $${RET} ; \ fi ; \ done local-clean: @for DIR in $(LOCALDIRS) ; do \ - echo "" ; \ - echo "Cleaning up $$DIR..." ; \ - cd $$DIR ; \ + $(ECHO) "" ; \ + $(ECHO) "Cleaning up $${DIR}..." ; \ + cd $${DIR} ; \ $(MAKE) clean ; \ RET=$$? ; \ cd $(SRCDIR) ; \ - if test "$$RET" != "0" ; then \ - exit $$RET ; \ + if test "$${RET}" != "0" ; then \ + exit $${RET} ; \ fi ; \ done 1.21 +6 -6 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- configure.in 2001/08/06 21:02:27 1.20 +++ configure.in 2001/08/06 22:21:52 1.21 @@ -58,7 +58,7 @@ dnl -------------------------------------------------------------------------- dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]> dnl Author Jon S. Stevens <mailto:[EMAIL PROTECTED]> -dnl Version $Id: configure.in,v 1.20 2001/08/06 21:02:27 pier Exp $ +dnl Version $Id: configure.in,v 1.21 2001/08/06 22:21:52 pier Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -245,17 +245,17 @@ cd ${APRDIR} LOCAL_HEADER([Building APR configure script]) -dnl LOCAL_FILTEREXEC([./buildconf],[APR buildconf]) +LOCAL_FILTEREXEC([./buildconf],[APR buildconf]) if ${TEST} "${ret}" -ne "0" then AC_MSG_ERROR([APR buildconf terminated with error code ${ret}]) fi LOCAL_HEADER([Configuring APR]) -dnl LOCAL_FILTEREXEC( -dnl [./configure --enable-static --disable-shared --disable-threads], -dnl [APR configure] -dnl ) +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}])
