Enable build with java as default.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 10bda82501
)
pull/158/head
parent
005403e878
commit
21382fb522
@ -0,0 +1,24 @@
|
||||
commit 5092f046c4f6b678a728bb1156123e0f0e45380f
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: Fri Sep 24 15:02:20 2021 +0200
|
||||
|
||||
Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
|
||||
|
||||
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||
(cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
|
||||
|
||||
diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
|
||||
index be90dd10..2fe8e5d5 100644
|
||||
--- a/dcopjava/binding/Makefile.am
|
||||
+++ b/dcopjava/binding/Makefile.am
|
||||
@@ -1,8 +1,8 @@
|
||||
lib_LTLIBRARIES = libjavadcop.la
|
||||
|
||||
libjavadcop_la_SOURCES = client.cpp
|
||||
-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
|
||||
-libjavadcop_la_LIBADD = $(LIB_TDECORE)
|
||||
+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
|
||||
+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
|
||||
|
||||
INCLUDES = $(jni_includes) $(all_includes)
|
||||
|
Loading…
Reference in new issue