diff options
| -rw-r--r-- | Module_tail_build.mk | 4 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 8 | ||||
| -rw-r--r-- | sane/Module_sane.mk | 4 |
5 files changed, 9 insertions, 11 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 719a6e6b202d..949195aeb1d4 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -85,9 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ reportbuilder \ reportdesign \ rsc \ - $(if $(filter SANE,$(BUILD_TYPE)),\ - sane \ - ) \ + sane \ sax \ sc \ scaddins \ diff --git a/config_host.mk.in b/config_host.mk.in index ee0ce101e94a..11b3a16a4435 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -526,7 +526,6 @@ export SYSTEM_PYTHON=@SYSTEM_PYTHON@ export SYSTEM_REDLAND=@SYSTEM_REDLAND@ export SYSTEM_RHINO=@SYSTEM_RHINO@ export SYSTEM_SAMPLEICC=@SYSTEM_SAMPLEICC@ -export SYSTEM_SANE_HEADER=@SYSTEM_SANE_HEADER@ export SYSTEM_SAXON=@SYSTEM_SAXON@ export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@ export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@ diff --git a/configure.in b/configure.in index 32332662c433..911588f4ce55 100644 --- a/configure.in +++ b/configure.in @@ -7799,15 +7799,12 @@ dnl =================================================================== AC_MSG_CHECKING([which sane header to use]) if test "$with_system_sane" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_SANE_HEADER=YES AC_CHECK_HEADER(sane/sane.h, [], [AC_MSG_ERROR(sane not found. install sane)], []) else AC_MSG_RESULT([internal]) - SYSTEM_SANE_HEADER=NO BUILD_TYPE="$BUILD_TYPE SANE" fi -AC_SUBST(SYSTEM_SANE_HEADER) dnl =================================================================== dnl Check for system icu diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 1a884a6a8bec..83a0b6d74d73 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,scn)) $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) -$(eval $(call gb_Library_use_packages,scn,\ - sane_inc \ -)) - $(eval $(call gb_Library_use_api,scn,\ udkapi \ offapi \ @@ -63,6 +59,10 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ )) else ifeq ($(GUI),UNX) +ifneq (,$(filter SANE,$(BUILD_TYPE))) +$(eval $(call gb_Library_use_packages,scn,sane_inc)) +endif + $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/grid \ extensions/source/scanner/sane \ diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk index f77ea2e19e7a..f812df7ec3db 100644 --- a/sane/Module_sane.mk +++ b/sane/Module_sane.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Module_Module,sane)) +ifeq ($(GUI),UNX) +ifneq (,$(filter SANE,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,sane,\ Package_inc \ )) +endif +endif |