mirror of
https://abf.rosa.ru/djam/hplip.git
synced 2025-02-23 16:32:58 +00:00
27 lines
1.1 KiB
Text
27 lines
1.1 KiB
Text
diff -Naur hplip-3.15.2.orig/configure.in hplip-3.15.2/configure.in
|
|
--- hplip-3.15.2.orig/configure.in 2015-03-30 05:47:07.804427140 -0400
|
|
+++ hplip-3.15.2/configure.in 2015-03-30 05:48:11.035209618 -0400
|
|
@@ -531,6 +531,8 @@
|
|
[FOUND_HEADER=yes; break;])
|
|
AS_IF([test "x$FOUND_HEADER" != "xyes"],
|
|
[AC_MSG_ERROR([cannot find python-devel support], 6)])
|
|
+ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command])
|
|
+ AC_CHECK_TOOLS([PYUIC4], [pyuic4])
|
|
fi
|
|
|
|
if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
|
|
diff -Naur hplip-3.15.2.orig/Makefile.am hplip-3.15.2/Makefile.am
|
|
--- hplip-3.15.2.orig/Makefile.am 2015-03-30 05:47:07.893426831 -0400
|
|
+++ hplip-3.15.2/Makefile.am 2015-03-30 05:47:08.758423824 -0400
|
|
@@ -3,6 +3,11 @@
|
|
#
|
|
# (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
|
|
# Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
|
|
+
|
|
+# Generic rules
|
|
+%.py: %.ui
|
|
+ $(PYUIC4) -x -o $@ $<
|
|
+
|
|
INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
|
|
CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
|
|
CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
|