You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axkit-dev@xml.apache.org by ma...@apache.org on 2002/03/17 12:17:25 UTC
cvs commit: xml-axkit MANIFEST.SKIP MANIFEST Makefile.PL
matts 02/03/17 03:17:25
Modified: . MANIFEST Makefile.PL
Added: . MANIFEST.SKIP
Log:
Removed extraneous modules (including expat) from distribution.
Updated Makefile.PL to reflect that, and fixed Makefile.PL in a few places
Added MANIFEST.SKIP file for easier manifest re-creation
Revision Changes Path
1.4 +101 -317 xml-axkit/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/xml-axkit/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MANIFEST 15 Mar 2002 11:48:40 -0000 1.3
+++ MANIFEST 17 Mar 2002 11:17:25 -0000 1.4
@@ -1,73 +1,36 @@
-MANIFEST
-README
-Makefile.PL
-AxKit.xs
AxKit.spec
-axconfig.h
-axconfig.c
-getstyles.h
-getstyles.c
+AxKit.xs
CONTRIB
+Changes
INSTALL
+MANIFEST
+MANIFEST.SKIP
+MANIFEST.old
+Makefile.PL
+README
SUPPORT
-Changes
-typemap
-t/00basic.t
-t/01provider.t
-t/02language.t
-t/03stylechooser.t
-t/04plugins.t
-t/05mediachooser.t
-t/test_module.pl
-lib/AxKit.pm
-lib/Apache/AxKit/StyleChooser/QueryString.pm
-lib/Apache/AxKit/StyleChooser/PathInfo.pm
-lib/Apache/AxKit/StyleChooser/FileSuffix.pm
-lib/Apache/AxKit/StyleChooser/Cookie.pm
-lib/Apache/AxKit/StyleChooser/UserAgent.pm
-lib/Apache/AxKit/MediaChooser/WAPCheck.pm
-lib/Apache/AxKit/Plugin/Passthru.pm
-lib/Apache/AxKit/Plugin/Fragment.pm
-lib/Apache/AxKit/Plugin/QueryStringCache.pm
-lib/Apache/AxKit/Provider.pm
-lib/Apache/AxKit/Provider/File.pm
-lib/Apache/AxKit/Provider/Scalar.pm
-lib/Apache/AxKit/Provider/Filter.pm
-lib/Apache/AxKit/Language.pm
-lib/Apache/AxKit/Language/XPathScript.pm
-lib/Apache/AxKit/Language/AxPoint.pm
-lib/Apache/AxKit/Language/Sablot.pm
-lib/Apache/AxKit/Language/LibXSLT.pm
-lib/Apache/AxKit/Language/PassiveTeX.pm
-lib/Apache/AxKit/Language/XMLNewsRDF.pm
-lib/Apache/AxKit/Language/XMLNewsNITF.pm
-lib/Apache/AxKit/Language/XSP.pm
-lib/Apache/AxKit/Language/XSP/TaglibHelper.pm
-lib/Apache/AxKit/ConfigReader.pm
-lib/Apache/AxKit/Cache.pm
-lib/Apache/AxKit/Exception.pm
-lib/Apache/AxKit/CharsetConv.pm
-lib/Apache/AxKit/CharsetConv.xs
-lib/Apache/AxKit/Makefile.PL
-lib/Apache/AxKit/typemap
-examples/.htaccess
-examples/index.xml
-examples/default.xps
-examples/default.notxslt
-examples/docbook_tags.xps
-examples/docbook_screen.xps
-examples/docbook_print.xps
-examples/docbook.dkb
-axkit.org/index.xml
+TODO
+axconfig.c
+axconfig.h
+axkit.org/docs/associating_stylesheets.xml
+axkit.org/docs/index.xml
+axkit.org/docs/introduction.dkb
+axkit.org/docs/presentations/tpc2001/ax_logo.png
+axkit.org/docs/presentations/tpc2001/redbg.png
+axkit.org/docs/presentations/tpc2001/tpc-axkit.axp
+axkit.org/docs/provider-howto.dkb
+axkit.org/docs/quick_start.dkb
+axkit.org/docs/xpathscript/guide.dkb
+axkit.org/docs/xsp/guide.dkb
+axkit.org/docs/xsp/index.xml
+axkit.org/examples/cv.css
+axkit.org/examples/cv.xml
+axkit.org/examples/cv.xps
+axkit.org/examples/cv_example.xml
+axkit.org/examples/docbook.dkb
+axkit.org/examples/resume.dtd
axkit.org/faq.xml
axkit.org/features.xml
-axkit.org/install.xml
-axkit.org/license.xml
-axkit.org/news.xml
-axkit.org/mailinglist.xml
-axkit.org/support.xml
-axkit.org/sidebar_new.xml
-axkit.org/sidebar.xml
axkit.org/img/arrow.gif
axkit.org/img/arrow_sel.gif
axkit.org/img/banner2.gif
@@ -87,24 +50,13 @@
axkit.org/img/rcorner_br.gif
axkit.org/img/rcorner_wh.gif
axkit.org/img/vsep.gif
-axkit.org/docs/associating_stylesheets.xml
-axkit.org/docs/index.xml
-axkit.org/docs/introduction.dkb
-axkit.org/docs/provider-howto.dkb
-axkit.org/docs/quick_start.dkb
-axkit.org/docs/xpathscript/guide.dkb
-axkit.org/docs/xsp/guide.dkb
-axkit.org/docs/xsp/index.xml
-axkit.org/docs/xsp/sqltaglib.dkb
-axkit.org/docs/presentations/tpc2001/tpc-axkit.axp
-axkit.org/docs/presentations/tpc2001/redbg.png
-axkit.org/docs/presentations/tpc2001/ax_logo.png
-axkit.org/examples/cv.xml
-axkit.org/examples/cv_example.xml
-axkit.org/examples/cv.css
-axkit.org/examples/cv.xps
-axkit.org/examples/docbook.dkb
-axkit.org/examples/resume.dtd
+axkit.org/index.xml
+axkit.org/install.xml
+axkit.org/license.xml
+axkit.org/mailinglist.xml
+axkit.org/news.xml
+axkit.org/sidebar.xml
+axkit.org/sidebar_new.xml
axkit.org/stylesheets/axkit.css
axkit.org/stylesheets/axkit_html.css
axkit.org/stylesheets/body_print_html.xps
@@ -122,237 +74,15 @@
axkit.org/stylesheets/new/webpage_html.xps
axkit.org/stylesheets/rdf_html.xps
axkit.org/stylesheets/sidebar_html.xps
-axkit.org/stylesheets/webpage_html.xps
axkit.org/stylesheets/spacer.xps
-expat-1.95.1/Changes
-expat-1.95.1/COPYING
-expat-1.95.1/MANIFEST
-expat-1.95.1/Makefile.in
-expat-1.95.1/README
-expat-1.95.1/aclocal.m4
-expat-1.95.1/config.hin
-expat-1.95.1/configure
-expat-1.95.1/configure.in
-expat-1.95.1/conftools/config.guess
-expat-1.95.1/conftools/config.sub
-expat-1.95.1/conftools/install-sh
-expat-1.95.1/conftools/ltconfig
-expat-1.95.1/conftools/ltmain.sh
-expat-1.95.1/conftools/missing
-expat-1.95.1/conftools/mkinstalldirs
-expat-1.95.1/doc/reference.html
-expat-1.95.1/doc/style.css
-expat-1.95.1/examples/Makefile.in
-expat-1.95.1/examples/outline.c
-expat-1.95.1/lib/Makefile.in
-expat-1.95.1/lib/ascii.h
-expat-1.95.1/lib/asciitab.h
-expat-1.95.1/lib/expat.dsp
-expat-1.95.1/lib/expat.h
-expat-1.95.1/lib/iasciitab.h
-expat-1.95.1/lib/latin1tab.h
-expat-1.95.1/lib/nametab.h
-expat-1.95.1/lib/utf8tab.h
-expat-1.95.1/lib/xmlparse.c
-expat-1.95.1/lib/xmlrole.c
-expat-1.95.1/lib/xmlrole.h
-expat-1.95.1/lib/xmltok.c
-expat-1.95.1/lib/xmltok.h
-expat-1.95.1/lib/xmltok_impl.c
-expat-1.95.1/lib/xmltok_impl.h
-expat-1.95.1/lib/xmltok_ns.c
-expat-1.95.1/lib/winconfig.h
-expat-1.95.1/xmlwf/Makefile.in
-expat-1.95.1/xmlwf/codepage.c
-expat-1.95.1/xmlwf/codepage.h
-expat-1.95.1/xmlwf/ct.c
-expat-1.95.1/xmlwf/filemap.h
-expat-1.95.1/xmlwf/readfilemap.c
-expat-1.95.1/xmlwf/unixfilemap.c
-expat-1.95.1/xmlwf/wfcheck.c
-expat-1.95.1/xmlwf/wfcheck.h
-expat-1.95.1/xmlwf/wfcheckmessage.c
-expat-1.95.1/xmlwf/win32filemap.c
-expat-1.95.1/xmlwf/xmlfile.c
-expat-1.95.1/xmlwf/xmlfile.h
-expat-1.95.1/xmlwf/xmlmime.c
-expat-1.95.1/xmlwf/xmlmime.h
-expat-1.95.1/xmlwf/xmltchar.h
-expat-1.95.1/xmlwf/xmlurl.h
-expat-1.95.1/xmlwf/xmlwf.c
-expat-1.95.1/xmlwf/xmlwf.dsp
-expat-1.95.1/xmlwf/xmlwin32url.cxx
-XML-Parser-2.30/samples/xmlstats
-XML-Parser-2.30/samples/REC-xml-19980210.xml
-XML-Parser-2.30/samples/canontst.xml
-XML-Parser-2.30/samples/xmlfilter
-XML-Parser-2.30/samples/canonical
-XML-Parser-2.30/samples/ctest.dtd
-XML-Parser-2.30/samples/xmlcomments
-XML-Parser-2.30/t/ext.ent
-XML-Parser-2.30/t/encoding.t
-XML-Parser-2.30/t/stream.t
-XML-Parser-2.30/t/foo.dtd
-XML-Parser-2.30/t/partial.t
-XML-Parser-2.30/t/cdata.t
-XML-Parser-2.30/t/namespaces.t
-XML-Parser-2.30/t/file.t
-XML-Parser-2.30/t/finish.t
-XML-Parser-2.30/t/astress.t
-XML-Parser-2.30/t/external_ent.t
-XML-Parser-2.30/t/defaulted.t
-XML-Parser-2.30/t/ext2.ent
-XML-Parser-2.30/t/skip.t
-XML-Parser-2.30/t/parament.t
-XML-Parser-2.30/t/decl.t
-XML-Parser-2.30/Parser/Encodings/windows-1250.enc
-XML-Parser-2.30/Parser/Encodings/euc-kr.enc
-XML-Parser-2.30/Parser/Encodings/Japanese_Encodings.msg
-XML-Parser-2.30/Parser/Encodings/x-sjis-unicode.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-2.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-3.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-4.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-5.enc
-XML-Parser-2.30/Parser/Encodings/x-euc-jp-jisx0221.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-7.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-8.enc
-XML-Parser-2.30/Parser/Encodings/iso-8859-9.enc
-XML-Parser-2.30/Parser/Encodings/x-sjis-cp932.enc
-XML-Parser-2.30/Parser/Encodings/x-euc-jp-unicode.enc
-XML-Parser-2.30/Parser/Encodings/x-sjis-jdk117.enc
-XML-Parser-2.30/Parser/Encodings/big5.enc
-XML-Parser-2.30/Parser/Encodings/README
-XML-Parser-2.30/Parser/Encodings/x-sjis-jisx0221.enc
-XML-Parser-2.30/Parser/LWPExternEnt.pl
-XML-Parser-2.30/Expat/Expat.xs
-XML-Parser-2.30/Expat/typemap
-XML-Parser-2.30/Expat/Makefile.PL
-XML-Parser-2.30/Expat/encoding.h
-XML-Parser-2.30/Expat/Expat.pm
-XML-Parser-2.30/MANIFEST
-XML-Parser-2.30/Changes
-XML-Parser-2.30/Makefile.PL
-XML-Parser-2.30/README
-XML-Parser-2.30/Parser.pm
-Digest-MD5-2.12/MD2/MD2.pm
-Digest-MD5-2.12/MD2/MD2.xs
-Digest-MD5-2.12/MD2/t/badfile.t
-Digest-MD5-2.12/MD2/t/md2.t
-Digest-MD5-2.12/MD2/rfc1319.txt
-Digest-MD5-2.12/MD2/typemap
-Digest-MD5-2.12/MD2/Makefile.PL
-Digest-MD5-2.12/SHA1/Makefile.PL
-Digest-MD5-2.12/SHA1/t/sha1.t
-Digest-MD5-2.12/SHA1/t/badfile.t
-Digest-MD5-2.12/SHA1/t/sha.t
-Digest-MD5-2.12/SHA1/SHA1.pm
-Digest-MD5-2.12/SHA1/SHA1.xs
-Digest-MD5-2.12/SHA1/lib/SHA.pm
-Digest-MD5-2.12/SHA1/fip180-1.html
-Digest-MD5-2.12/SHA1/fip180-1.gif
-Digest-MD5-2.12/SHA1/typemap
-Digest-MD5-2.12/t/digest.t
-Digest-MD5-2.12/t/badfile.t
-Digest-MD5-2.12/t/rfc2202.t
-Digest-MD5-2.12/t/md5.t
-Digest-MD5-2.12/t/files.t
-Digest-MD5-2.12/t/md5-aaa.t
-Digest-MD5-2.12/rfc2104.txt
-Digest-MD5-2.12/MD5.pm
-Digest-MD5-2.12/lib/Digest.pm
-Digest-MD5-2.12/lib/Digest/HMAC_MD5.pm
-Digest-MD5-2.12/lib/Digest/HMAC_SHA1.pm
-Digest-MD5-2.12/lib/Digest/HMAC.pm
-Digest-MD5-2.12/lib/MD5.pm
-Digest-MD5-2.12/hints/dec_osf.pl
-Digest-MD5-2.12/hints/irix_6.pl
-Digest-MD5-2.12/MANIFEST
-Digest-MD5-2.12/Changes
-Digest-MD5-2.12/MD5.xs
-Digest-MD5-2.12/typemap
-Digest-MD5-2.12/examples/twdigest.pl
-Digest-MD5-2.12/examples/mddriver.pl
-Digest-MD5-2.12/Makefile.PL
-Digest-MD5-2.12/README
-Digest-MD5-2.12/rfc1321.txt
-Compress-Zlib-1.09/t/examples.t
-Compress-Zlib-1.09/t/zlib.t
-Compress-Zlib-1.09/README
-Compress-Zlib-1.09/examples/gzgrep
-Compress-Zlib-1.09/examples/gzcat
-Compress-Zlib-1.09/examples/filtdef
-Compress-Zlib-1.09/examples/filtinf
-Compress-Zlib-1.09/examples/gzstream
-Compress-Zlib-1.09/MANIFEST
-Compress-Zlib-1.09/ANNOUNCE
-Compress-Zlib-1.09/Zlib.xs
-Compress-Zlib-1.09/typemap
-Compress-Zlib-1.09/config.in
-Compress-Zlib-1.09/Makefile.PL
-Compress-Zlib-1.09/Makefile.NT
-Compress-Zlib-1.09/Zlib.pm
-Error-0.13/t/02order.t
-Error-0.13/t/01throw.t
-Error-0.13/Error.pm
-Error-0.13/MANIFEST
-Error-0.13/ChangeLog
-Error-0.13/Makefile.PL
-Error-0.13/Error.ppd
-Error-0.13/example
-Error-0.13/README
-libapreq-0.31_03/CREDITS
-libapreq-0.31_03/Changes
-libapreq-0.31_03/INSTALL
-libapreq-0.31_03/LICENSE
-libapreq-0.31_03/MANIFEST
-libapreq-0.31_03/Makefile.PL
-libapreq-0.31_03/Makefile.am
-libapreq-0.31_03/README
-libapreq-0.31_03/ToDo
-libapreq-0.31_03/acconfig.h
-libapreq-0.31_03/acinclude.m4
-libapreq-0.31_03/aclocal.m4
-libapreq-0.31_03/config.guess
-libapreq-0.31_03/config.sub
-libapreq-0.31_03/configure.in
-libapreq-0.31_03/install-sh
-libapreq-0.31_03/libapreq.pod
-libapreq-0.31_03/libtool
-libapreq-0.31_03/ltconfig
-libapreq-0.31_03/ltmain.sh
-libapreq-0.31_03/mkinstalldirs
-libapreq-0.31_03/typemap
-libapreq-0.31_03/Cookie/Cookie.pm
-libapreq-0.31_03/Cookie/Cookie.xs
-libapreq-0.31_03/Cookie/Makefile.PL
-libapreq-0.31_03/Request/Makefile.PL
-libapreq-0.31_03/Request/Request.pm
-libapreq-0.31_03/Request/Request.xs
-libapreq-0.31_03/c/Makefile.PL
-libapreq-0.31_03/c/Makefile.am
-libapreq-0.31_03/c/Makefile.noperl
-libapreq-0.31_03/c/apache_cookie.c
-libapreq-0.31_03/c/apache_cookie.h
-libapreq-0.31_03/c/apache_multipart_buffer.c
-libapreq-0.31_03/c/apache_multipart_buffer.h
-libapreq-0.31_03/c/apache_request.c
-libapreq-0.31_03/c/apache_request.h
-libapreq-0.31_03/c/libapreq_config.h.in
-libapreq-0.31_03/c/stamp-h.in
-libapreq-0.31_03/c/Makefile.in
-libapreq-0.31_03/eg/c/testapreq/Makefile.apxs
-libapreq-0.31_03/eg/c/testapreq/Makefile.tmpl
-libapreq-0.31_03/eg/c/testapreq/mod_testapreq.c
-libapreq-0.31_03/eg/c/testapreq/mod_testapreq.module
-libapreq-0.31_03/eg/perl/cookie.pl
-libapreq-0.31_03/eg/perl/file_upload.pl
-libapreq-0.31_03/lib/Apache/libapreq.pm
-libapreq-0.31_03/Makefile.in
-libapreq-0.31_03/configure
-demo/axpoint/.htaccess
-demo/axpoint/error.html
+axkit.org/stylesheets/webpage_html.xps
+axkit.org/support.xml
+demo/.#axkit.conf.1.2
demo/.htaccess
+demo/AxKit/XSP/Demo/Simple.pm
demo/axkit.conf
+demo/axpoint/.htaccess
+demo/axpoint/error.html
demo/index.html
demo/stylesheets/error.xsl
demo/stylesheets/style.css
@@ -360,24 +90,78 @@
demo/xpathscript/error.html
demo/xslfo/.htaccess
demo/xslfo/error.html
+demo/xslt-sablot/.htaccess
+demo/xslt-sablot/error.html
demo/xslt/.htaccess
demo/xslt/error.html
demo/xslt/index.xml
demo/xslt/stylesheet.xsl
-demo/xslt-sablot/.htaccess
-demo/xslt-sablot/error.html
-demo/xsp/index.xml
demo/xsp/.htaccess
-demo/xsp/error.html
-demo/xsp/showsource.xsp
+demo/xsp/auth.xsp
+demo/xsp/cookie.xsp
demo/xsp/core.xsp
+demo/xsp/error.html
demo/xsp/esql.xsp
-demo/xsp/cookie.xsp
demo/xsp/exception.xsp
+demo/xsp/globals.xsp
demo/xsp/ifparam.xsp
+demo/xsp/index.xml
demo/xsp/param.xsp
demo/xsp/perform.xsp
demo/xsp/sendmail.xsp
+demo/xsp/session.xsp
+demo/xsp/showsource.xsp
+demo/xsp/simpletaglib-simple.xsp
demo/xsp/util.xsp
demo/xsp/webutils.xsp
-demo/xsp/session.xsp
+examples/.htaccess
+examples/default.notxslt
+examples/default.xps
+examples/docbook.dkb
+examples/docbook_print.xps
+examples/docbook_screen.xps
+examples/docbook_tags.xps
+examples/index.xml
+getstyles.c
+getstyles.h
+lib/Apache/AxKit/Cache.pm
+lib/Apache/AxKit/CharsetConv.pm
+lib/Apache/AxKit/CharsetConv.xs
+lib/Apache/AxKit/ConfigReader.pm
+lib/Apache/AxKit/Exception.pm
+lib/Apache/AxKit/Language.pm
+lib/Apache/AxKit/Language/AxPoint.pm
+lib/Apache/AxKit/Language/LibXSLT.pm
+lib/Apache/AxKit/Language/PassiveTeX.pm
+lib/Apache/AxKit/Language/Query.pm
+lib/Apache/AxKit/Language/Sablot.pm
+lib/Apache/AxKit/Language/XMLNewsNITF.pm
+lib/Apache/AxKit/Language/XMLNewsRDF.pm
+lib/Apache/AxKit/Language/XPathScript.pm
+lib/Apache/AxKit/Language/XSP.pm
+lib/Apache/AxKit/Language/XSP/SimpleTaglib.pm
+lib/Apache/AxKit/Language/XSP/TaglibHelper.pm
+lib/Apache/AxKit/Makefile.PL
+lib/Apache/AxKit/MediaChooser/WAPCheck.pm
+lib/Apache/AxKit/Plugin/Fragment.pm
+lib/Apache/AxKit/Plugin/Passthru.pm
+lib/Apache/AxKit/Plugin/QueryStringCache.pm
+lib/Apache/AxKit/Provider.pm
+lib/Apache/AxKit/Provider/File.pm
+lib/Apache/AxKit/Provider/Filter.pm
+lib/Apache/AxKit/Provider/Scalar.pm
+lib/Apache/AxKit/StyleChooser/Cookie.pm
+lib/Apache/AxKit/StyleChooser/FileSuffix.pm
+lib/Apache/AxKit/StyleChooser/PathInfo.pm
+lib/Apache/AxKit/StyleChooser/QueryString.pm
+lib/Apache/AxKit/StyleChooser/UserAgent.pm
+lib/Apache/AxKit/typemap
+lib/AxKit.pm
+t/00basic.t
+t/01provider.t
+t/02language.t
+t/03stylechooser.t
+t/04plugins.t
+t/05mediachooser.t
+t/test_module.pl
+typemap
1.4 +72 -56 xml-axkit/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/xml-axkit/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.PL 7 Feb 2002 14:18:20 -0000 1.3
+++ Makefile.PL 17 Mar 2002 11:17:25 -0000 1.4
@@ -1,12 +1,16 @@
-# $Id: Makefile.PL,v 1.3 2002/02/07 14:18:20 kip Exp $
+# $Id: Makefile.PL,v 1.4 2002/03/17 11:17:25 matts Exp $
package AxKit;
# file Makefile.PL
+use strict;
use ExtUtils::MakeMaker;
use Text::Wrap ();
use Cwd;
+use Config;
+
+use vars qw($DEBUG $is_Win32 $DEVNULL);
require 5.005;
@@ -20,7 +24,6 @@
my @DIRS = ('./lib/Apache/AxKit');
my $from_dir = cwd;
-my $expat_dir = "expat-1.95.1";
######################################################
# Standard bits required for have_library and friends
@@ -48,51 +51,60 @@
require Apache::src;
-my $install_expat = 0;
+my $xml_parser_found = 0;
-unless (have_module('XML::Parser', '2.27')) {
- # XML::Parser not installed
- if (!have_library("expat")) {
- print "compiling expat... ";
- eval {
- my $expat_opts = delete $config{EXPAT_OPTS};
- xsystem("cd $expat_dir && ./configure $expat_opts && make");
- $install_expat = 1;
- $config{"EXPATINCPATH"} = MM->catdir($from_dir, $expat_dir, 'lib');
- $config{"EXPATLIBPATH"} = MM->catdir($from_dir, $expat_dir, 'lib', '.libs');
- print "ok\n";
- };
- if ($@) {
- print "failed\n";
- die "Compilation of expat failed. Re-run with DEBUG=1 to see why.\n";
- }
- }
- push @DIRS, 'XML-Parser-2.30';
-}
+test_module('Digest::MD5', '2.09', <<"REASON") || die;
+***** ERROR *****
-unless (have_module('Digest::MD5', '2.09')) {
- push @DIRS, 'Digest-MD5-2.12';
-}
+Digest::MD5 2.09 or higher required. This module is used
+to create hash entries for the AxKit cache, and
+in a number of other parts of the code for MD5 hashing. You will
+need to install that module before installing AxKit.
+REASON
-unless (have_module('Compress::Zlib')) {
- push @DIRS, 'Compress-Zlib-1.09';
-}
+test_module('Compress::Zlib', 0, <<"REASON") || die;
+***** ERROR *****
-unless (have_module('Error', '0.13')) {
- push @DIRS, 'Error-0.13';
-}
+Compress::Zlib (any version) required. This module is required
+for AxKit's facility for gzipping the
+output before delivery to the browser. You will need to install
+that module before installing AxKit.
+REASON
-unless (have_module('Apache::Request', '0.31_03')) {
- push @DIRS, 'libapreq-0.31_03';
-}
+test_module('Error', '0.13', <<"REASON") || die;
+***** ERROR *****
+
+Error 0.13 or higher required. This module is required for
+AxKit's internal exception handling
+routines. You will need to install that module before installing
+AxKit.
+REASON
+
+test_module('Apache::Request', '0.31_03', <<"REASON") || die;
+***** ERROR *****
+
+Apache::Request 0.32 or higher required. This module is used
+throughout AxKit for querystring and form value
+parsing. You will need to install that module before installing AxKit.
+REASON
+
+test_module('XML::Parser', '2.27', <<"REASON") and ($xml_parser_found++);
+[Warning]
+XML::Parser 2.27 may be required if we cannot find libxml2 installed
+below, or if you intend to use XML::Parser based modules from
+within AxKit. It is not required that you install this module, but
+it is sometimes advisable.
+REASON
test_module('XML::XPath', '1.00', <<"REASON");
+[Warning]
XML::XPath 1.00 or higher is required for XPathScript
to work. You don't have to install it, but you won't be able
to use XPathScript stylesheets without it.
REASON
test_module('HTTP::GHTTP', '1.00', <<"REASON");
+[Warning]
HTTP::GHTTP is used for retrieving remote URIs within AxKit.
We use HTTP::GHTTP because it is significantly faster and lighter
than LWP, however AxKit will use LWP if it cannot locate
@@ -101,18 +113,21 @@
test_module('XML::Sablotron', '0.40', <<"REASON");
+[Warning]
XML::Sablotron 0.40 or higher is required for our Sablotron
XSLT processor to work. You don't have to install it,
but you won't be able to use Apache::AxKit::Language::Sablot without it.
REASON
test_module('XML::LibXML', '1.31', <<"REASON");
+[Warning]
XML::LibXML 1.31 or higher is required for the XSP engine
to work. You don't have to install it, but you won't
be able to use XSP pages without it.
REASON
test_module('XML::LibXSLT', '1.31', <<"REASON");
+[Warning]
XML::LibXSLT 1.31 or higher is required for our LibXSLT
XSLT processor to work. You don't have to install it,
but you won't be able to use Apache::AxKit::Language::LibXSLT without it.
@@ -134,6 +149,7 @@
if (have_library('xml2')) {
$config{DEFINE} .= ' -DHAVE_LIBXML2';
$config{LIBS} .= ' -lxml2 -lz';
+ $xml_parser_found++;
}
elsif (!$is_Win32) {
my $apache;
@@ -191,6 +207,17 @@
qq{ -L"$Apache::MyConfig::Setup{MODPERL_LIB}" -lmod_perl};
}
+if (!$xml_parser_found) {
+ die <<"REASON";
+
+***** ERROR *****
+
+No XML Parser library found (tried XML::Parser and libxml2). You
+will need to install one of these before AxKit can function properly.
+
+REASON
+}
+
$config{INC} .= ' ' . Apache::src->new->inc;
if ($DEBUG) {
@@ -226,7 +253,7 @@
use Symbol;
use File::Spec;
-use vars qw/$DEVNULL $is_Win32/;
+use vars qw/$DEVNULL $is_Win32 $RUNNING_UNDER_CPAN/;
BEGIN {
$is_Win32 = ($^O =~ /Win32/);
@@ -237,6 +264,13 @@
$DEVNULL = eval { File::Spec->devnull };
if ($@) { $DEVNULL = '/dev/null' }
}
+ my $cwd = cwd();
+ if ($cwd =~ /\.cpan/) {
+ $RUNNING_UNDER_CPAN = 1;
+ }
+ else {
+ $RUNNING_UNDER_CPAN = 0;
+ }
}
sub rm_f {
@@ -458,36 +492,18 @@
sub test_module {
my ($module, $version, $reason) = @_;
unless (have_module($module, $version)) {
- if ($INC{'CPAN.pm'}) {
+ if ($RUNNING_UNDER_CPAN) {
if (prompt("Add $module to list of modules to install?", 'Y') =~ /^y/i) {
$config{PREREQ_PM}{$module} = $version;
+ return 1;
}
}
else {
print wrap($reason);
+ return 0;
}
- return 0;
}
return 1;
-}
-
-sub MY::install {
- package MY;
- my $self = shift;
-
- my $install = $self->SUPER::install(@_);
-
- if ($install_expat) {
- $install =~ s/(install :: .*)$/$1 expat_install/m;
- $install .= <<INSTALL;
-
-expat_install :
-\t\@cd $expat_dir && \$(SHELL) -c \$(MAKE) install
-
-INSTALL
- }
-
- return $install;
}
sub is_apache {
1.1 xml-axkit/MANIFEST.SKIP
Index: MANIFEST.SKIP
===================================================================
CVS/.*
\.bak$
\.sw[a-z]$
\.tar$
\.tgz$
\.tar\.gz$
^.#
^mess/
^tmp/
^blib/
Makefile$
^Makefile\.[a-z]+$
^pm_to_blib$
~$