X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=aeeba7fdfabb0bcbb4c8db3b5a7194a241021822;hb=e3a9d21d6e0e19827adb3ffaec368c3bad93e0d9;hp=8a1bed734ef1c7ae13cd6ea47164ecff045f8c53;hpb=deba21330c9623f837876625ad4b973a8c975c9a;p=koha_gimpoz

diff --git a/Makefile.PL b/Makefile.PL
index 8a1bed734e..aeeba7fdfa 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -250,6 +250,7 @@ my $target_map = {
   './changelanguage.pl'         => 'INTRANET_CGI_DIR',
   './check_sysprefs.pl'         => 'NONE',
   './circ'                      => 'INTRANET_CGI_DIR',
+  './offline_circ'		=> 'INTRANET_CGI_DIR',
   './edithelp.pl'               => 'INTRANET_CGI_DIR',
   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
   './etc/zebradb'               => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
@@ -412,6 +413,9 @@ my %config_defaults = (
   'PAZPAR2_PORT' => '11002',
   'RUN_DATABASE_TESTS' => 'no',
   'PATH_TO_ZEBRA' => '',
+  'USE_MEMCACHED'     => 'no',
+  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
+  'MEMCACHED_NAMESPACE' => 'KOHA'
 );
 
 # set some default configuration options based on OS
@@ -448,6 +452,7 @@ my %valid_config_values = (
   'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
   'ZEBRA_LANGUAGE'    => { 'en' => 1, 'fr' => 1 }, # FIXME should generate from contents of distribution
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
+  'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
 );
 
 # get settings from command-line
@@ -540,7 +545,7 @@ WriteMakefile(
                             'Class::Factory::Util'             => 1.6,
                             'Class::Accessor'                  => 0.30,
                             'DBD::mysql'                       => 4.004,
-                            'DBD::SQLite'                      => 1.13, # optional, used for offline circulation
+                            'DBD::SQLite2'                     => 0.33, # optional, used for offline circulation
                             'DBI'                              => 1.53,
                             'Data::Dumper'                     => 2.121,
                             'Data::ICal'                       => 0.13,
@@ -548,6 +553,7 @@ WriteMakefile(
                             'Date::ICal'                       => 1.72,
                             'Date::Manip'                      => 5.44,
                             'Digest::MD5'                      => 2.36,
+                            'Digest::SHA'                      => 5.43,
                             'Email::Date'                      => 1.103,
                             'File::Temp'                       => 0.16,
                             'GD'                               => 2.39,    #optional
@@ -557,7 +563,9 @@ WriteMakefile(
                             'HTML::Template::Pro'              => 0.69,
                             'HTML::Scrubber'                   => 0.08,
                             'HTTP::Cookies'                    => 1.39,
+                            'HTTP::OAI'                        => 3.20,
                             'HTTP::Request::Common'            => 1.26,
+                            'IPC::Cmd'                         => 0.46,
                             'JSON'                             => 2.07, # Needed by admin/item_circulation_alerts.pl
                             'LWP::Simple'                      => 1.41,
                             'LWP::UserAgent'                   => 2.033,
@@ -573,22 +581,27 @@ WriteMakefile(
                             'MIME::Lite'                       => 3.00,
                             'MIME::QuotedPrint'                => 3.07,
                             'Mail::Sendmail'                   => 0.79,
+                            'Memoize::Memcached'               => 0.03, # optional
                             'Net::LDAP'                        => 0.33, # optional
                             'Net::LDAP::Filter'                => 0.14, # optional
                             'Net::Z3950::ZOOM'                 => 1.16,
+                            'Number::Format'                   => 1.52,
                             'PDF::API2'                        => 2.000,
                             'PDF::API2::Page'                  => 2.000,
                             'PDF::API2::Util'                  => 2.000,
+                            'PDF::API2::Simple'                => 1.000,
+                            'PDF::Table'                       => 0.9.3,
                             'PDF::Reuse'                       => 0.33,
                             'PDF::Reuse::Barcode'              => 0.05,
                             'POE'                              => 0.9999,
                             'POSIX'                            => 1.09,
                             'Schedule::At'                     => 1.06,
+                            'Storable'	                       => 2.21,
                             'SMS::Send'                        => 0.05, # optional
                             'Term::ANSIColor'                  => 1.10,
                             'Test'                             => 1.25,
                             'Test::Harness'                    => 2.56,
-                            'Test::More'                       => 0.62,
+                            'Test::More'                       => 0.80,
                             'Text::CSV'                        => 0.01,
                             'Text::CSV_XS'                     => 0.32,
                             'Text::Iconv'                      => 1.7,
@@ -596,10 +609,12 @@ WriteMakefile(
                             'Time::HiRes'                      => 1.86,
                             'Time::localtime'                  => 1.02,
                             'Unicode::Normalize'               => 0.32,
+                            'URI::Escape'                      => 1.36,
                             'XML::Dumper'                      => 0.81,
                             'XML::LibXML'                      => 1.59,
                             'XML::LibXSLT'                     => 1.59,
                             'XML::SAX::ParserFactory'          => 1.01,
+                            'XML::SAX::Writer'                 => 0.44,
                             'XML::Simple'                      => 2.14,
                             'XML::RSS'                         => 1.31,
                             'YAML::Syck'                       => 0.71,
@@ -838,7 +853,10 @@ be run from the current directory.
 
 Configuration directory:);
         # FIXME - home directory portability consideration apply
-        $install_base_default = (exists $ENV{'HOME'}) ? "$ENV{'HOME'}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev";
+        $install_base_default = 
+	    $ENV{DESTDIR}
+	    || ( exists $ENV{HOME} ? "$ENV{HOME}/koha-dev" : "$defaults->{'INSTALL_BASE'}-dev" ) 
+	;
     } elsif ($config{'INSTALL_MODE'} eq 'single') {
         $msg = "\nPlease specify the directory in which to install Koha";
         # FIXME -- we're assuming under a 'single' mode install
@@ -1077,6 +1095,26 @@ PazPar2 port?);
 
         }
     }
+  $msg = q(
+Use memcached and memoize to cache the results of some function calls? 
+This provides a signficant performance improvement. 
+You will need a Memcached server running.);
+  $msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values);
+  $config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values);
+  if ($config{'USE_MEMCACHED'} eq 'yes'){
+      $msg = q(
+Since you've chosen to use caching, you must specify the memcached servers and the namespace to use:
+);
+      $msg = q(
+Memcached server address?);
+      $config{'MEMCACHED_SERVERS'} = _get_value('MEMCACHED_SERVERS', $msg, $defaults->{'MEMCACHED_SERVERS'}, $valid_values, $install_log_values);
+       
+      $msg = q(
+Memcached namespace?);
+      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
+  }
+
+
 
   $msg = q(
 Would you like to run the database-dependent test suite?);