diff options
| author | Didier Raboud <odyx@debian.org> | 2016-01-04 18:30:37 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2016-01-04 18:30:37 +0100 |
| commit | 0bf4920d38f2d496460d5539f595f665b0cda0c3 (patch) | |
| tree | 5de3dad95a941bf6b1f6b250f00de3767caf500f /installer/core_install.py | |
| parent | fa9e0aa75b188e385e9533ae9bc73b60aabce43a (diff) | |
Imported Upstream version 3.10.2
Diffstat (limited to 'installer/core_install.py')
| -rw-r--r-- | installer/core_install.py | 72 |
1 files changed, 69 insertions, 3 deletions
diff --git a/installer/core_install.py b/installer/core_install.py index 36d2ff4c0..063511ae2 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -1231,28 +1231,94 @@ class CoreInstall(object): self.native_cups = self.get_distro_ver_data('native_cups')
if self.native_cups is not None and self.native_cups == 1:
- configure_cmd += ' --enable-hpcups-install --enable-cups-ppd-install --enable-cups-drv-install'
+ configure_cmd += ' --enable-hpcups-install --enable-cups-drv-install --enable-cups-ppd-install --disable-hpijs-install --disable-foomatic-drv-install --disable-foomatic-ppd-install --disable-foomatic-rip-hplip-install'
else:
- configure_cmd += ' --enable-hpijs-install --disable-hpcups-install --enable-foomatic-ppd-install --enable-foomatic-drv-install --disable-cups-drv-install --enable-foomatic-rip-hplip-install'
+ configure_cmd += ' --disable-hpcups-install --disable-cups-drv-install --disable-cups-ppd-install --enable-hpijs-install --enable-foomatic-drv-install --enable-foomatic-ppd-install --enable-foomatic-rip-hplip-install'
self.fax_supported = self.get_distro_ver_data('fax_supported')
if self.fax_supported is None:
configure_cmd += ' --disable-fax-build --disable-dbus-build'
+ else:
+ configure_cmd += ' --enable-fax-build --enable-dbus-build'
self.network_supported = self.get_distro_ver_data('network_supported')
if self.network_supported is None:
- configure_cmd += ' --disable-network-build'
+ configure_cmd += ' --disable-network-build'
+ else:
+ configure_cmd += ' --enable-network-build'
self.scan_supported = self.get_distro_ver_data('scan_supported')
if self.scan_supported is None:
configure_cmd += ' --disable-scan-build'
+ else:
+ configure_cmd += ' --enable-scan-build'
self.policykit = self.get_distro_ver_data('policykit')
if self.policykit is not None and self.policykit == 1:
configure_cmd += ' --enable-policykit'
+ else:
+ configure_cmd += ' --disable-policykit'
+
+ return configure_cmd
+
+ def configure_qt4(self):
+ configure_cmd = './configure'
+ configure_cmd += ' --prefix=/usr'
+ configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir
+
+ if self.bitness == 64:
+ configure_cmd += ' --libdir=/usr/lib64'
+
+ self.ui_toolkit = self.get_distro_ver_data('ui_toolkit')
+ if self.ui_toolkit is not None and self.ui_toolkit == 'qt3':
+ configure_cmd += ' --enable-qt3 --disable-qt4'
+ else:
+ configure_cmd += ' --enable-qt4'
+
+ self.native_cups = self.get_distro_ver_data('native_cups')
+ self.ppd_install = self.get_distro_ver_data('ppd_install')
+ if self.native_cups is not None and self.native_cups == 1:
+ configure_cmd += ' --enable-hpcups-install'
+ if self.ppd_install == 'drv':
+ configure_cmd += ' --enable-cups-drv-install --disable-cups-ppd-install'
+ else:
+ configure_cmd += ' --enable-cups-ppd-install --disable-cups-drv-install'
+ configure_cmd += ' --disable-hpijs-install --disable-foomatic-drv-install --disable-foomatic-ppd-install --disable-foomatic-rip-hplip-install'
+ else:
+ configure_cmd += ' --enable-hpijs-install'
+ if self.ppd_install == 'drv':
+ configure_cmd += ' --enable-foomatic-drv-install --disable-foomatic-ppd-install'
+ else:
+ configure_cmd += ' --enable-foomatic-ppd-install --disable-foomatic-drv-install'
+ configure_cmd += ' --enable-foomatic-rip-hplip-install --disable-hpcups-install --disable-cups-drv-install --disable-cups-ppd-install'
+
+ self.fax_supported = self.get_distro_ver_data('fax_supported')
+ if self.fax_supported is None:
+ configure_cmd += ' --disable-fax-build --disable-dbus-build'
+ else:
+ configure_cmd += ' --enable-fax-build --enable-dbus-build'
+
+ self.network_supported = self.get_distro_ver_data('network_supported')
+ if self.network_supported is None:
+ configure_cmd += ' --disable-network-build'
+ else:
+ configure_cmd += ' --enable-network-build'
+
+ self.scan_supported = self.get_distro_ver_data('scan_supported')
+ if self.scan_supported is None:
+ configure_cmd += ' --disable-scan-build'
+ else:
+ configure_cmd += ' --enable-scan-build'
+
+ self.policykit = self.get_distro_ver_data('policykit')
+ if self.policykit is not None and self.policykit == 1:
+ configure_cmd += ' --enable-policykit'
+ else:
+ configure_cmd += ' --disable-policykit'
return configure_cmd
+
def restart_cups(self):
if os.path.exists('/etc/init.d/cups'):
cmd = self.su_sudo() % '/etc/init.d/cups restart'
|