configure.ac | 14 ++++++++++++++ loleaflet/Makefile.am | 4 ++++ 2 files changed, 18 insertions(+)
New commits: commit 4331f2d87b9f3144eee21d4d06dfc8f97ce01848 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Fri Jun 21 10:43:53 2019 +0200 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Fri Jun 21 10:55:18 2019 +0200 configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 (cherry picked from commit 50a9da56aa466add3e25f3a8785e24f5996a554c) diff --git a/configure.ac b/configure.ac index d18baf46c..381d88c47 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,10 @@ AC_ARG_ENABLE([gtkapp], to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket message plumbing point of view. See gtk/README.])) +AC_ARG_WITH([icon-theme], + AS_HELP_STRING([--with-icon-theme=<path>], + [Path to custom icon theme (similiar to loleflet/images).])) + AC_ARG_ENABLE([seccomp], AS_HELP_STRING([--disable-seccomp], [Disable use of linux/seccomp.h header when kernel on target system does not support it. @@ -273,6 +277,16 @@ AC_SUBST(ENABLE_IOSAPP) AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"]) AC_SUBST(IOSAPP_NAME) +AC_MSG_CHECKING([for custom icon theme]) +CUSTOM_ICONS_DIRECTORY= +if test -d "$with_icon_theme"; then + CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme` + AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY]) +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(CUSTOM_ICONS_DIRECTORY) + ENABLE_GTKAPP= if test "$enable_gtkapp" = "yes"; then ENABLE_GTKAPP=true diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 1e9d9ca4a..ba5cc2e3c 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -242,6 +242,10 @@ $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js $(builddir)/dist/images/%: $(srcdir)/images/% @mkdir -p $(dir $@) @cp $< $@ + @if test -d '$(CUSTOM_ICONS_DIRECTORY)'; then \ + `cp -r "$(CUSTOM_ICONS_DIRECTORY)"/* $(builddir)/dist/images/`; \ + fi + $(builddir)/dist/%.html: $(srcdir)/html/%.html @mkdir -p $(dir $@) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
