add external for clucene

Repository.mk

@@ -358,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     avmediagst \
     avmediawin \
     cached1 \
-    clucene \
     collator_data \
     deployment \
     deploymentgui \

RepositoryExternal.mk

@@ -1120,6 +1120,39 @@ endef
 endif # SYSTEM_POPPLER
 
 
+ifeq ($(SYSTEM_CLUCENE),YES)
+
+define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_add_defs,$(1),\
+	$(filter-out -I%,$(CLUCENE_CFLAGS)) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	$(filter -I%,$(CLUCENE_CFLAGS)) \
+	$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(CLUCENE_LIBS) \
+)
+
+endef
+
+else # !SYSTEM_CLUCENE
+
+define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	clucene \
+)
+
+endef
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
+	clucene \
+))
+
+endif # SYSTEM_CLUCENE
+
 # MacOSX-only frameworks ############################################
 # (in alphabetical order)
 

config_host.mk.in

@@ -41,6 +41,8 @@ export CDR_CFLAGS=@CDR_CFLAGS@
 export CDR_LIBS=@CDR_LIBS@
 export CLASSPATH=@CLASSPATH@
 export CL_X64=@CL_X64@
+export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
+export CLUCENE_LIBS=@CLUCENE_LIBS@
 export COM=@COM@
 export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
 export COMEX=@COMEX@
@@ -448,6 +450,7 @@ export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@
 export SYSTEM_BOOST=@SYSTEM_BOOST@
 export SYSTEM_BSH=@SYSTEM_BSH@
 export SYSTEM_CAIRO=@SYSTEM_CAIRO@
+export SYSTEM_CLUCENE=@SYSTEM_CLUCENE@
 export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
 export SYSTEM_CURL=@SYSTEM_CURL@
 export SYSTEM_DB=@SYSTEM_DB@

configure.in

@@ -5855,13 +5855,13 @@ AC_MSG_CHECKING([which clucene to use])
 if test "$with_system_clucene" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_CLUCENE=YES
-    PKG_CHECK_MODULES(LIBCLUCENE, libclucene-core)
+    PKG_CHECK_MODULES(CLUCENE, libclucene-core)
 
     AC_LANG_PUSH([C++])
     save_CXXFLAGS=$CXXFLAGS
     save_CPPFLAGS=$CPPFLAGS
-    CXXFLAGS="$CXXFLAGS $LIBCLUCENE_CFLAGS"
-    CPPFLAGS="$CPPFLAGS $LIBCLUCENE_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $CLUCENE_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS"
     dnl http://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446
     dnl https://bugzilla.redhat.com/show_bug.cgi?id=794795
     AC_CHECK_HEADER([CLucene/analysis/cjk/CJKAnalyzer.h], [],
@@ -5870,15 +5870,15 @@ if test "$with_system_clucene" = "yes"; then
     CPPFLAGS=$save_CPPFLAGS
     AC_LANG_POP([C++])
 
-    LIBCLUCENE_LIBS="$LIBCLUCENE_LIBS -lclucene-contribs-lib"
+    CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib"
 else
     AC_MSG_RESULT([internal])
     SYSTEM_CLUCENE=NO
     BUILD_TYPE="$BUILD_TYPE CLUCENE"
 fi
 AC_SUBST(SYSTEM_CLUCENE)
-AC_SUBST(LIBCLUCENE_CFLAGS)
-AC_SUBST(LIBCLUCENE_LIBS)
+AC_SUBST(CLUCENE_CFLAGS)
+AC_SUBST(CLUCENE_LIBS)
 
 dnl ===================================================================
 dnl Check for system expat