You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2006/01/14 18:16:52 UTC
svn commit: r369059 [1/7] - in /tcl/rivet/trunk: ./ doc/html/ src/
src/apache-1/ src/apache-2/
Author: davidw
Date: Sat Jan 14 09:15:42 2006
New Revision: 369059
URL: http://svn.apache.org/viewcvs?rev=369059&view=rev
Log:
I hope I haven't made a mess of this transition...
* configure.ac: edited for 2 directories src/apache-1 and src/apache-2 to be
the source directory for either Apache1.x or Apache2.x. Added new autoconf
macros to check for apache base directory, apache/apr include directories
(on debian for instance, they are in /usr/include/apache1.3 resp.
/usr/include/apache2 and /usr/include/apr-0) and apache version (
--apache-version=1 or --apache-version=2). According to the macros, the
sources either in src/apache-1 or src/apache-2 are compiled.
* src/: put all sources for rivet for Apache1.x into a subdirectory
apache-1, left the Makefile.am unchanged. Copied the files to a
subdirectory apache-2 and started port of rivet to Apache2.2 with these
files.
Added:
tcl/rivet/trunk/src/apache-1/
tcl/rivet/trunk/src/apache-1/Makefile.am
tcl/rivet/trunk/src/apache-1/Makefile.in
tcl/rivet/trunk/src/apache-1/TclWebapache.c
- copied unchanged from r332098, tcl/rivet/trunk/src/TclWebapache.c
tcl/rivet/trunk/src/apache-1/apache_multipart_buffer.c
- copied, changed from r332098, tcl/rivet/trunk/src/apache_multipart_buffer.c
tcl/rivet/trunk/src/apache-1/apache_multipart_buffer.h
- copied, changed from r332098, tcl/rivet/trunk/src/apache_multipart_buffer.h
tcl/rivet/trunk/src/apache-1/apache_multipart_buffer.loT
tcl/rivet/trunk/src/apache-1/apache_request.c
- copied, changed from r332098, tcl/rivet/trunk/src/apache_request.c
tcl/rivet/trunk/src/apache-1/apache_request.h
- copied, changed from r332098, tcl/rivet/trunk/src/apache_request.h
tcl/rivet/trunk/src/apache-1/configure.in.tcl
- copied unchanged from r332098, tcl/rivet/trunk/src/configure.in.tcl
tcl/rivet/trunk/src/apache-1/configure.tcl
- copied unchanged from r332098, tcl/rivet/trunk/src/configure.tcl
tcl/rivet/trunk/src/apache-1/make.tcl
- copied unchanged from r332098, tcl/rivet/trunk/src/make.tcl
tcl/rivet/trunk/src/apache-1/mod_rivet.c
- copied, changed from r332098, tcl/rivet/trunk/src/mod_rivet.c
tcl/rivet/trunk/src/apache-1/mod_rivet.h
- copied, changed from r332098, tcl/rivet/trunk/src/mod_rivet.h
tcl/rivet/trunk/src/apache-2/
tcl/rivet/trunk/src/apache-2/Makefile.am
tcl/rivet/trunk/src/apache-2/Makefile.in
tcl/rivet/trunk/src/apache-2/TclWebapache.c
tcl/rivet/trunk/src/apache-2/TclWebcgi.c
tcl/rivet/trunk/src/apache-2/apache_multipart_buffer.c
tcl/rivet/trunk/src/apache-2/apache_multipart_buffer.h
tcl/rivet/trunk/src/apache-2/apache_request.c
tcl/rivet/trunk/src/apache-2/apache_request.h
tcl/rivet/trunk/src/apache-2/configure.in.tcl
tcl/rivet/trunk/src/apache-2/configure.tcl (with props)
tcl/rivet/trunk/src/apache-2/make.tcl (with props)
tcl/rivet/trunk/src/apache-2/mod_rivet.c
tcl/rivet/trunk/src/apache-2/mod_rivet.h
tcl/rivet/trunk/src/apache-2/rivetCore.c
Removed:
tcl/rivet/trunk/src/TclWebapache.c
tcl/rivet/trunk/src/apache_multipart_buffer.c
tcl/rivet/trunk/src/apache_multipart_buffer.h
tcl/rivet/trunk/src/apache_request.c
tcl/rivet/trunk/src/apache_request.h
tcl/rivet/trunk/src/configure.in.tcl
tcl/rivet/trunk/src/configure.tcl
tcl/rivet/trunk/src/make.tcl
tcl/rivet/trunk/src/mod_rivet.c
tcl/rivet/trunk/src/mod_rivet.h
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/acinclude.m4
tcl/rivet/trunk/configure
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/doc/html/commands.en.html
tcl/rivet/trunk/doc/html/dio.en.html
tcl/rivet/trunk/doc/html/diodisplay.en.html
tcl/rivet/trunk/doc/html/directives.en.html
tcl/rivet/trunk/doc/html/examples.en.html
tcl/rivet/trunk/doc/html/help.en.html
tcl/rivet/trunk/doc/html/index.en.html
tcl/rivet/trunk/doc/html/installation.en.html
tcl/rivet/trunk/doc/html/internals.en.html
tcl/rivet/trunk/doc/html/session_package.en.html
tcl/rivet/trunk/doc/html/tcl_packages.en.html
tcl/rivet/trunk/doc/html/upgrading.en.html
tcl/rivet/trunk/src/Makefile.am
tcl/rivet/trunk/src/Makefile.in
tcl/rivet/trunk/src/TclWeb.h
tcl/rivet/trunk/src/rivetChannel.c
tcl/rivet/trunk/src/rivetCore.c
tcl/rivet/trunk/src/rivetParser.c
tcl/rivet/trunk/src/rivetParser.h
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/ChangeLog?rev=369059&r1=369058&r2=369059&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Jan 14 09:15:42 2006
@@ -1,3 +1,21 @@
+2006-01-14 Eckhard Lehmann <ec...@gmx.de>
+
+ * configure.ac: edited for 2 directories src/apache-1 and
+ src/apache-2 to be the source directory for either Apache1.x or
+ Apache2.x. Added new autoconf macros to check for apache base
+ directory, apache/apr include directories (on debian for instance,
+ they are in /usr/include/apache1.3 resp. /usr/include/apache2 and
+ /usr/include/apr-0) and apache version ( --apache-version=1 or
+ --apache-version=2). According to the macros, the sources either
+ in src/apache-1 or src/apache-2 are compiled.
+
+ * src/: put all sources for rivet for Apache1.x into a
+ subdirectory apache-1, left the Makefile.am unchanged. Copied the
+ files to a subdirectory apache-2 and started port of rivet to
+ Apache2.2 with these files.
+
+ * Checked in by davidw.
+
2005-12-12 Karl Lehenbauer <ka...@sc.com>
* rivet/packages/dio/dio.tcl: Reverted change to "store" method
that removed fields from the store array that were part of the
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/Makefile.in?rev=369059&r1=369058&r2=369059&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Sat Jan 14 09:15:42 2006
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,9 +19,10 @@
#
# ...gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 265494 2005-08-12 22:37:57Z davidw $
+# $Id: Makefile.am,v 1.8 2005/08/12 22:37:57 davidw Exp $
#
#foreign -- need to set this somehow
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -29,6 +30,7 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -42,48 +44,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure ChangeLog INSTALL TODO \
- tclconfig/ChangeLog tclconfig/compile tclconfig/config.guess \
- tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
- tclconfig/ltmain.sh tclconfig/missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/tclconfig/tcl.m4 \
- $(top_srcdir)/tclconfig/libtool.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -165,8 +126,6 @@
PKG_INCLUDES = @PKG_INCLUDES@
PKG_LIBS = @PKG_LIBS@
PKG_LIB_FILE = @PKG_LIB_FILE@
-PKG_OBJECTS = @PKG_OBJECTS@
-PKG_SOURCES = @PKG_SOURCES@
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
@@ -215,8 +174,9 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
+apache_include = @apache_include@
+apache_version_dir = @apache_version_dir@
+apr_include = @apr_include@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -237,7 +197,6 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
-mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -245,44 +204,47 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+
EXTRA_DIST = LICENSE contrib debian doc rivet win/nmakehlp.c src/testing.c src/TclWebcgi.c
SUBDIRS = src doc
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/tclconfig/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = src/${apache_version_dir}/Makefile
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+ ps-recursive install-info-recursive uninstall-info-recursive \
+ all-recursive install-data-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive \
+ check-recursive installcheck-recursive
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 \
+ aclocal.m4 config.h.in configure configure.ac \
+ tclconfig/ChangeLog tclconfig/compile tclconfig/config.guess \
+ tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
+ tclconfig/ltmain.sh tclconfig/missing tclconfig/mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
+$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+
+$(ACLOCAL_M4): configure.ac acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -294,13 +256,15 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+
+$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
+ touch $(srcdir)/config.h.in
distclean-hdr:
-rm -f config.h stamp-h1
+src/${apache_version_dir}/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/${apache_version_dir}/Makefile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -371,6 +335,14 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -379,22 +351,19 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
-tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
- empty_fix=.; \
else \
include_option=--include; \
- empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
+ test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -404,11 +373,10 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -431,11 +399,24 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/src $(distdir)/tclconfig $(distdir)/win
+ $(mkinstalldirs) $(distdir)/src $(distdir)/src/${apache_version_dir} $(distdir)/tclconfig $(distdir)/win
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -447,7 +428,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -462,17 +443,15 @@
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
distdir) \
|| exit 1; \
fi; \
@@ -483,46 +462,19 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
@@ -542,20 +494,19 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -579,6 +530,7 @@
all-am: Makefile config.h
installdirs: installdirs-recursive
installdirs-am:
+
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -599,7 +551,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -611,15 +563,13 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
-html: html-recursive
-
info: info-recursive
info-am:
@@ -656,21 +606,24 @@
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive dist dist-all dist-gzip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-local install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-local install-data-recursive install-exec \
+ install-exec-am install-exec-recursive install-info \
+ install-info-am install-info-recursive install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-recursive
libtool: $(LIBTOOL_DEPS)
Modified: tcl/rivet/trunk/acinclude.m4
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/acinclude.m4?rev=369059&r1=369058&r2=369059&view=diff
==============================================================================
--- tcl/rivet/trunk/acinclude.m4 (original)
+++ tcl/rivet/trunk/acinclude.m4 Sat Jan 14 09:15:42 2006
@@ -19,3 +19,32 @@
#
# Add here whatever m4 macros you want to define for your package
#
+
+#
+# check for apache base directory
+#
+AC_DEFUN([APACHE_DIR],[
+
+ AC_ARG_WITH(
+ apache,
+ [ --with-apache[=DIR] Apache server directory],
+ ,
+ [with_apache="no"]
+ )
+
+ AC_MSG_CHECKING(for Apache directory)
+
+ if test "$with_apache" = "no"; then
+ AC_MSG_ERROR( Specify the apache using --with-apache)
+ else
+ # make sure that a well known include file exists
+ if test -e $with_apache/include/httpd.h; then
+ apache_dir=$with_apache
+ AC_MSG_RESULT(APACHE found!)
+ else
+ AC_MSG_ERROR( $with_apache not found. )
+ fi
+ fi
+
+])
+
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org