5af5eaec9a
Adjust patch #2 to apply successfully. Fixes: http://autobuild.buildroot.net/results/bee/beea88e0848ccabcafe6b92c2a69074ed1114225/ http://autobuild.buildroot.net/results/4ba/4ba68d3e6764f395f3314c46c4d06b101c23479c/ http://autobuild.buildroot.net/results/345/3455044679a497fbee72378e59178724305720d9/ .. and many more. The previous version 3.15.11 failed to build because of: ``` hpijs/hpcupsfax.cpp: In function 'int main(int, char**)': prnt/hpijs/hpcupsfax.cpp:651:5: error: 'ppd_file_t' was not declared in this scope ppd_file_t *ppd; ^ ``` `ppd_file_t` is defined in "cups/ppd.h" which was not included in 3.15.11, but is in 3.16.11. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From a2de7e834417de68db10dc6f09d5810b06e6cbc8 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Thu, 21 Jan 2016 23:54:50 +0100
|
|
Subject: [PATCH] configure.in: fix AM_INIT_AUTOMAKE call
|
|
|
|
Uncomment the appropriate call to AM_INIT_AUTOMAKE so that the
|
|
"foreign" option is passed, which avoids the need for creating various
|
|
unneeded files when autoreconfiguring.
|
|
|
|
Add the subdir-objects options since the main Makefile.am references
|
|
files in subdirectories. This allows to silence a huge amount of
|
|
warning when autoreconfiguring.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
configure.in | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 8b06428..680cad5 100755
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -27,8 +27,7 @@
|
|
|
|
#AC_PREREQ(2.59)
|
|
AC_INIT([HP Linux Imaging and Printing], [3.16.11], [3.16.11], [hplip])
|
|
-#AM_INIT_AUTOMAKE([1.9 foreign])
|
|
-AM_INIT_AUTOMAKE
|
|
+AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
|
|
AC_DISABLE_STATIC
|
|
|
|
# Checks for programs.
|
|
--
|
|
2.6.4
|
|
|