From bc581b57b8300b848c41bd42864415f5e3415242 Mon Sep 17 00:00:00 2001
From: root <root@rbsd.ankarstrom.se>
Date: Sat, 24 Apr 2021 19:00:25 +0000
Subject: Fix dependencies, improve installation instructions

---
 Makefile.PL          | 36 +++++++++++++++++++++++++++---------
 README               | 10 ++++++++--
 lib/Apache/Inject.pm | 14 +++++++++++---
 t/SMOKE              |  2 +-
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index bf6e6f1..bebfcbc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@
 
 use 5.008000;
 
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker 6.64;
 
 use lib qw(../blib/lib lib);
 
@@ -12,12 +12,30 @@ Apache::TestMM::filter_args();
 Apache::TestMM::generate_script('t/TEST');
 
 WriteMakefile(
-	NAME           => 'Apache::Inject',
-	VERSION_FROM   => 'lib/Apache/Inject.pm',
-	PREREQ_PM      => { Apache::Test => 0 },
-	ABSTRACT_FROM  => 'lib/Apache/Inject.pm',
-	AUTHOR         => 'John Ankarström <john@ankarstrom.se>',
-	LICENSE        => 'perl',
-	clean          => { FILES => "t/TEST" },
-	dist           => { PREOP => 'pod2text lib/Apache/Inject.pm > $(DISTVNAME)/README' },
+	NAME => 'Apache::Inject',
+	VERSION_FROM => 'lib/Apache/Inject.pm',
+	ABSTRACT_FROM => 'lib/Apache/Inject.pm',
+	AUTHOR => 'John Ankarström <john@ankarstrom.se>',
+	LICENSE => 'perl',
+	CONFIGURE_REQUIRES => {
+		ExtUtils::MakeMaker => 6.64,
+		Apache::TestMM => 0,
+	},
+	TEST_REQUIRES => {
+		Apache::Test => 0,
+	},
+	PREREQ_PM => {
+		Apache2::CmdParms => 0,
+		Apache2::Const => 0,
+		Apache2::Log => 0,
+		Apache2::Module => 0,
+		Apache2::RequestRec => 0,
+		Apache2::RequestUtil => 0,
+	},
+	clean => {
+		FILES => 't/TEST',
+	},
+	dist => {
+		PREOP => 'pod2text lib/Apache/Inject.pm > $(DISTVNAME)/README',
+	},
 );
diff --git a/README b/README
index 6dbbbc5..a7c716b 100644
--- a/README
+++ b/README
@@ -47,6 +47,9 @@ INSTALLATION
       make test
       make install
 
+    Note that the Apache::* and Apache2::* dependencies are included with
+    mod_perl2.
+
 OPERATION
     Behind the scenes, the Inject directive works as an alias for
     PerlResponseHandler and PerlSetVar. For example, "Inject head.html
@@ -95,13 +98,16 @@ DIAGNOSTICS
         cannot retrieve the current document root from Apache.
 
 CAVEATS
-    On FreeBSD, you need to enable the accf_http kernel module in order for
-    the tests to work. Note that Apache::Inject works fine without the
+    On FreeBSD, you may need to enable the accf_http kernel module in order
+    for the tests to work. Note that Apache::Inject works fine without the
     module; it is only the tests that require it.
 
 AUTHOR
     John Ankarström, <john [at] ankarstrom.se>
 
+SEE ALSO
+    mod_perl2: <https://perl.apache.org/>
+
 COPYRIGHT AND LICENSE
     Copyright (C) 2021 by John Ankarström
 
diff --git a/lib/Apache/Inject.pm b/lib/Apache/Inject.pm
index c83fab7..eb4fa36 100644
--- a/lib/Apache/Inject.pm
+++ b/lib/Apache/Inject.pm
@@ -104,6 +104,9 @@ To install this module type the following:
   make test
   make install
 
+Note that the Apache::* and Apache2::* dependencies are included
+with mod_perl2.
+
 =head1 OPERATION
 
 Behind the scenes, the Inject directive works as an alias for
@@ -164,14 +167,19 @@ cannot retrieve the current document root from Apache.
 
 =head1 CAVEATS
 
-On FreeBSD, you need to enable the accf_http kernel module in order
-for the tests to work.  Note that Apache::Inject works fine without
-the module; it is only the tests that require it.
+On FreeBSD, you may need to enable the accf_http kernel module in
+order for the tests to work.  Note that Apache::Inject works fine
+without the module; it is only the tests that require it.
 
 =head1 AUTHOR
 
 John Ankarström, E<lt>john [at] ankarstrom.seE<gt>
 
+=head1 SEE ALSO
+
+mod_perl2:
+L<https://perl.apache.org/>
+
 =head1 COPYRIGHT AND LICENSE
 
 Copyright (C) 2021 by John Ankarström
diff --git a/t/SMOKE b/t/SMOKE
index 45ac158..816d80a 100755
--- a/t/SMOKE
+++ b/t/SMOKE
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 # WARNING: this file is generated, do not edit
-# generated on Sat Apr 24 15:23:46 2021
+# generated on Sat Apr 24 18:58:44 2021
 # 01: /usr/local/lib/perl5/site_perl/mach/5.32/Apache/TestConfig.pm:1003
 # 02: /usr/local/lib/perl5/site_perl/mach/5.32/Apache/TestConfig.pm:1095
 # 03: /usr/local/lib/perl5/site_perl/mach/5.32/Apache/TestSmoke.pm:775
-- 
cgit v1.2.3