[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
+AC_ARG_ENABLE(gtk2-dependency,
+ AC_HELP_STRING([--enable-gtk2-dependency],
+ [Do not build gtk-update-icon-cache and other shared tools]),,
+ [enable_gtk2_dependency=no])
+
+AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
+
AC_ARG_ENABLE(xkb,
[AC_HELP_STRING([--enable-xkb],
[support XKB extension [default=maybe]])],,
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-if test $cross_compiling = yes; then
+if test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes; then
AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
if test x$GTK_UPDATE_ICON_CACHE = xno; then
REBUILD_PNGS=#
fi
fi
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes])
+
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
<group>
<arg>--enable-introspection=[no/auto/yes]</arg>
</group>
+ <group>
+ <arg>--enable-gtk2-dependency</arg>
+ <arg>--disable-gtk2-dependency</arg>
+ </group>
</cmdsynopsis>
</para>
supported backends are the quartz backend for OS X.
</para>
</formalpara>
+
<formalpara>
<title><systemitem>--enable-introspection</systemitem></title>
The default is 'auto'.
</para>
</formalpara>
+
+ <formalpara>
+ <title><systemitem>--enable-gtk2-dependency</systemitem> or
+ <systemitem>--disable-gtk2-dependency</systemitem></title>
+
+ <para>
+ Whether to rely on an exiting gtk-update-icon-cache utility
+ instead of building our own. Distributions which are shipping
+ both GTK+ 2.x and GTK+ 3 may want to use this option to
+ avoid file conflicts between these packages.
+ The default is to build gtk-update-icon-cache.
+ </para>
+ </formalpara>
</refsect1>
</refentry>
# Installed tools
#
bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
- gtk-update-icon-cache
+ gtk-query-immodules-3.0
+
+if BUILD_ICON_CACHE
+bin_PROGRAMS += gtk-update-icon-cache
+endif
bin_SCRIPTS = gtk-builder-convert
gtk_query_immodules_3_0_LDADD = $(LDADDS)
gtk_query_immodules_3_0_SOURCES = queryimmodules.c
+if BUILD_ICON_CACHE
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c
+endif
.PHONY: files test test-debug
) done \
&& touch stamp-icons
-if CROSS_COMPILING
+if USE_EXTERNAL_ICON_CACHE
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else
-gtk_update_icon_cache_program = \
- ./gtk-update-icon-cache
+gtk_update_icon_cache_program = ./gtk-update-icon-cache
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons