diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-30 00:22:11 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-30 00:32:25 +0200 |
| commit | c88234357f97020885010d50aa3e2c3e1c53d605 (patch) | |
| tree | 581ed2dbe23bec47dfa1a99e98e5fc63c90d8379 | |
| parent | e8551287cf2161ba7a55eb19df23069e693d6b3e (diff) | |
reportbuilder: build only when enabled
Change-Id: Iee65c6bd8ddc51b3ae703e6d38c825f3801389fe
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | reportbuilder/Module_reportbuilder.mk | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 94f545e3e61c..f5088f9aaee3 100644 --- a/configure.in +++ b/configure.in @@ -9119,7 +9119,6 @@ AC_MSG_CHECKING([whether to build the Report Builder extension]) if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) ENABLE_REPORTBUILDER=YES - AC_MSG_CHECKING([for reportbuilder module]) AC_MSG_CHECKING([which jfreereport libs to use]) if test "$with_system_jfreereport" = "yes"; then SYSTEM_JFREEREPORT=YES @@ -9282,11 +9281,9 @@ if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration" else AC_MSG_RESULT([internal]) - AC_MSG_CHECKING([for jfreereport module]) SYSTEM_JFREEREPORT=NO BUILD_TYPE="$BUILD_TYPE JFREEREPORT" fi - BUILD_TYPE="$BUILD_TYPE REPORTBUILDER" else AC_MSG_RESULT([no]) ENABLE_REPORTBUILDER=NO diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index 9d3bea51a253..1829743ddb86 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) -ifneq ($(SOLAR_JAVA),) +ifeq ($(ENABLE_REPORTBUILDER),YES) $(eval $(call gb_Module_add_targets,reportbuilder,\ Configuration_reportbuilder \ Extension_reportbuilder \ |