--- trunk/Makefile.PL	2007/11/14 11:00:11	1045
+++ trunk/Makefile.PL	2007/11/19 20:26:03	1053
@@ -3,57 +3,65 @@
 #use ExtUtils::MakeMaker;
 use inc::Module::Install;
 
-license 'GPL';
 
-WriteMakefile(
-    NAME                => 'WebPAC',
-    AUTHOR              => 'Dobrica Pavlinusic <dpavlin@rot13.org>',
-    VERSION_FROM        => 'lib/WebPAC.pm',
-    ABSTRACT_FROM       => 'lib/WebPAC.pm',
-    PL_FILES            => {},
-    PREREQ_PM => {
-	'Test::More' => 0,
-	'YAML' => 0,
-	'File::Slurp' => 0,
-	'Log::Log4perl' => '1.02',
-	'Cwd' => 0,
-	'Storable' => 0,
-	'DBM::Deep' => 0,
-#	'Template' => 0,
-	'Time::HiRes' => 0,
-	'File::Temp' => 0,
-	'List::Util' => 0,
-	'Encode' => 0,
-	'LWP' => 0,
-	'File::Path' => 0,
-	'Biblio::Isis' => '0.24',
-	'MARC::Fast' => '0.09',
-#	'Search::Estraier' => 0.06,
-	'List::Util' => 0,
-	'Spreadsheet::ParseExcel', => 0,
-	'MARC::Record' => '2.0',
-	'Data::Dump' => 0,
-	'MARC::Lint' => '1.43',
-	# WebPAC::Normalize::ISBN
-	'Business::ISBN' => '2.02',
-	'Proc::Queue' => 0,
-	'PPI' => 0,
-	'XML::LibXML' => 0,
-	'Pod::Usage' => 0,
-	'Class::Accessor' => 0,
-	'JSON' => 0,
-	'File::Spec' => 0,
-	'Sort::External' => 0,
-	# WebPAC::Input::XML
-	'XML::Simple' => 0,
-	'File::Find' => 0,
-    },
-    dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-    clean               => { FILES => 'WebPAC-* pod2html Makefile tags' },
+name	'WebPAC';
+version	'2.32';
+license	'GPL';
+
+requires	'YAML';
+requires	'File::Slurp';
+requires	'Log::Log4perl' => '1.02';
+requires	'Cwd';
+requires	'Storable';
+requires	'DBM::Deep';
+#	'Template';
+requires	'Time::HiRes';
+requires	'File::Temp';
+requires	'List::Util';
+requires	'Encode';
+requires	'LWP';
+requires	'File::Path';
+requires	'Biblio::Isis' => '0.24';
+requires	'MARC::Fast' => '0.09';
+requires	'List::Util';
+requires	'Spreadsheet::ParseExcel';
+requires	'MARC::Record' => '2.0';
+requires	'Data::Dump';
+requires	'MARC::Lint' => '1.43';
+requires	'Business::ISBN' => '2.02';	# WebPAC::Normalize::ISBN
+requires	'Proc::Queue';
+requires	'PPI';
+requires	'XML::LibXML';
+requires	'Pod::Usage';
+requires	'Class::Accessor';
+requires	'JSON';
+requires	'File::Spec';
+requires	'Sort::External';
+
+features(
+	'WebPAC::Input::XML' => [
+		-default => 0,
+		recommends('XML::Simple'),
+		recommends('File::Find'),
+	],
+);
+
+features(
+	'WebPAC::Output::Estraier' => [
+		-default => 0,
+		recommends('Search::Estraier' => 0.06),
+	],
 );
 
+
+build_requires 'Test::More';
+
+clean_files('WebPAC-* pod2html Makefile tags');
+
 auto_install;
 
+WriteAll;
+
 sub MY::postamble {
 	return <<'MAKE_MORE';