--- trunk/Makefile.PL	2007/11/20 22:07:45	1061
+++ trunk/Makefile.PL	2008/09/22 15:32:24	1116
@@ -5,7 +5,7 @@
 
 
 name	'WebPAC';
-version	'2.33';
+version_from 'lib/WebPAC.pm';
 license	'GPL';
 
 requires	'YAML';
@@ -13,7 +13,7 @@
 requires	'Log::Log4perl' => '1.02';
 requires	'Cwd';
 requires	'Storable';
-requires	'DBM::Deep';
+#requires	'DBM::Deep';
 #	'Template';
 requires	'Time::HiRes';
 requires	'File::Temp';
@@ -24,12 +24,10 @@
 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';
@@ -39,35 +37,45 @@
 requires	'Sort::External';
 
 features(
-	'WebPAC::Output::Webpacus and WebPAC::Output::Jifty' => [
-		-default => 0,
-		recommends('Jifty'),
-	],
-);
-
-features(
 	'WebPAC::Input::XML' => [
 		-default => 0,
-		recommends('XML::Simple'),
-		recommends('File::Find'),
+		'XML::Simple',
+		'File::Find',
 	],
-);
-
-features(
 	'WebPAC::Input::PDF' => [
 		-default => 0,
-		recommends('CAM::PDF'),
+		'CAM::PDF',
+	],
+	'WebPAC::Input::Excel' => [
+		-default => 1,
+		'Spreadsheet::ParseExcel',
+	],
+	'WebPAC::Input::DBF' => [
+		-default => 0,
+		'XBase',
 	],
-);
-
-features(
 	'WebPAC::Output::Estraier' => [
 		-default => 0,
-		recommends('Search::Estraier' => 0.06),
+		'Search::Estraier' => 0.06,
+	],
+	'WebPAC::Output::Webpacus and WebPAC::Output::Jifty' => [
+		-default => 0,
+		'Jifty',
+	],
+	'WebPAC::Output::Excel' => [
+		-default => 1,
+		'Spreadsheet::WriteExcel' => 2.14,
+	],
+	'WebPAC::Output::KinoSearch' => [
+		-default => 1,
+		'KinoSearch::Simple',
+	],
+	'Parallel execution (probably broken)' => [
+		-default => 0,
+		'Proc::Queue',
 	],
 );
 
-
 build_requires 'Test::More';
 
 clean_files('WebPAC-* pod2html Makefile tags');