diff options
| -rw-r--r-- | RepositoryModule_build.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 | ||||
| -rw-r--r-- | extras/Module_extras.mk | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 981db4427bc7..11aae8eab25d 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -56,7 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ ure \ xmlreader \ $(call gb_Helper_optional_for_host,DESKTOP, \ - $(if $(filter YES,$(WITH_GALLERY_BUILD)), \ + $(if $(WITH_GALLERY_BUILD), \ avmedia \ basebmp \ basic \ diff --git a/configure.ac b/configure.ac index 5ed0344c1df7..48cf9fa8149a 100644 --- a/configure.ac +++ b/configure.ac @@ -1371,9 +1371,8 @@ AC_ARG_WITH(linked-git, AC_ARG_WITH(galleries, AS_HELP_STRING([--with-galleries], [Specify how galleries should be built. It is possible either to - build these internally from source ("build"), or to (optionally - download and) unpack them them from a package ("package"), or - to disable them ("no")]), + build these internally from source ("build"), + or to disable them ("no")]), ) AC_ARG_WITH(theme, @@ -2401,11 +2400,8 @@ dnl =================================================================== AC_MSG_CHECKING([how to build and package galleries]) if test -n "${with_galleries}"; then if test "$with_galleries" = "build"; then - WITH_GALLERY_BUILD=YES + WITH_GALLERY_BUILD=TRUE AC_MSG_RESULT([build from source images internally]) - elif test "$with_galleries" = "package"; then - WITH_GALLERY_BUILD=PACKAGE - AC_MSG_ERROR([FIXME - implement build from pre-compiled package]) elif test "$with_galleries" = "no"; then WITH_GALLERY_BUILD= AC_MSG_RESULT([disable non-internal gallery build]) @@ -2414,7 +2410,7 @@ if test -n "${with_galleries}"; then fi else if test $_os != iOS -a $_os != Android; then - WITH_GALLERY_BUILD=YES + WITH_GALLERY_BUILD=TRUE AC_MSG_RESULT([internal src images for desktop]) else WITH_GALLERY_BUILD= diff --git a/external/Module_external.mk b/external/Module_external.mk index 3fa5501e1819..e9e90c47acfe 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,XSLTML,xsltml) \ $(call gb_Helper_optional,ZLIB,zlib) \ $(call gb_Helper_optional_for_host,DESKTOP, \ - $(if $(filter YES,$(WITH_GALLERY_BUILD)), \ + $(if $(WITH_GALLERY_BUILD), \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,NSS,nss) \ diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index c84d77669ba3..a2c25b4b88fb 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_l10n_targets,extras,\ AllLangPackage_autotextshare \ )) -ifeq ($(WITH_GALLERY_BUILD),YES) +ifneq ($(WITH_GALLERY_BUILD),) $(eval $(call gb_Module_add_targets,extras,\ Gallery_arrows \ Gallery_computers \ |