diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-07 15:50:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-07 16:18:25 +0200 |
| commit | 22c60cbbfbee2aaae9710af020e150a30a17a49e (patch) | |
| tree | 68f144bd64dc20c377235a78aa81b39fc522d56a | |
| parent | More OUString ctor simplifcations (diff) | |
| download | core-22c60cbbfbee2aaae9710af020e150a30a17a49e.tar.gz core-22c60cbbfbee2aaae9710af020e150a30a17a49e.zip | |
add external for clucene
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 33 | ||||
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.in | 12 |
4 files changed, 42 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index 4484e5f944d3..8f72da924849 100644 --- a/Repository.mk +++ b/Repository.mk @@ -358,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ avmediagst \ avmediawin \ cached1 \ - clucene \ collator_data \ deployment \ deploymentgui \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c6a033cd8912..fab2995286fb 100644 --- a/RepositoryExternal.mk +++ b/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) diff --git a/config_host.mk.in b/config_host.mk.in index 0e896d880794..6a2cfce27359 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/configure.in b/configure.in index 2158d03dbbab..a7841e6af8d0 100644 --- a/configure.in +++ b/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 |