# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1206836347 0
# Node ID e4b2cbc246da8d8c94cec518e5c79ed5a411d0ef
# Parent  25d34ee594353963fbf41dad83e114ef879b564c
I'm tired of installing pixmap data that almost never changes.  I'm so tired of
it, in fact, that I decided to add the ability to disable pixmap installation
to our configure script.  For the two of us that actually wanted it, here it is.

diff -r 25d34ee59435 -r e4b2cbc246da configure.ac
--- a/configure.ac	Sat Mar 29 19:14:17 2008 +0000
+++ b/configure.ac	Sun Mar 30 00:19:07 2008 +0000
@@ -2144,6 +2144,13 @@
 AC_SUBST(CHECK_LIBS)
 
 dnl #######################################################################
+dnl # Disable pixmap installation
+dnl #######################################################################
+AC_ARG_ENABLE(pixmaps-install, AC_HELP_STRING([--enable-pixmaps-install], [enable installation of pixmap files]), enable_pixmaps="$enableval", enable_pixmaps=yes)
+
+AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
+
+dnl #######################################################################
 dnl # Check for Doxygen and dot (part of GraphViz)
 dnl #######################################################################
 AC_ARG_ENABLE(doxygen,
@@ -2300,6 +2307,7 @@
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
 echo Use kerberos 4 with zephyr.... : $kerberos
 echo Use external libzephyr........ : $zephyr
+echo Install pixmaps............... : $enable_pixmaps
 echo Has you....................... : yes
 echo
 echo Use XScreenSaver Extension.... : $enable_screensaver
diff -r 25d34ee59435 -r e4b2cbc246da pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sat Mar 29 19:14:17 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sun Mar 30 00:19:07 2008 +0000
@@ -3,6 +3,7 @@
 
 SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none
 
+if INSTALL_PIXMAPS
 MAKEFILE_MINGW = \
 		buddy_icons/qq/Makefile.mingw \
 		emotes/default/24/Makefile.mingw \
@@ -707,3 +708,4 @@
 		$(ICONS_24) \
 		$(ICONS_32) \
 		$(ICONS_48)
+endif
diff -r 25d34ee59435 -r e4b2cbc246da pidgin/pixmaps/buddy_icons/qq/Makefile.am
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.am	Sat Mar 29 19:14:17 2008 +0000
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.am	Sun Mar 30 00:19:07 2008 +0000
@@ -100,6 +100,8 @@
 	qq_99.png \
 	qq_100.png
 
+if INSTALL_PIXMAPS
 qqbuddyiconspixdir = $(datadir)/pixmaps/purple/buddy_icons/qq
 
 qqbuddyiconspix_DATA = $(EXTRA_DIST)
+endif
diff -r 25d34ee59435 -r e4b2cbc246da pidgin/pixmaps/emotes/default/24/Makefile.am
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Sat Mar 29 19:14:17 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Sun Mar 30 00:19:07 2008 +0000
@@ -190,8 +190,10 @@
     yin-yang.png
 
 
+pidginsmileypix_in_files = default.theme.in
+
+if INSTALL_PIXMAPS
 pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/default
-pidginsmileypix_in_files = default.theme.in
 pidginsmileypix_DATA = \
         $(SMILEYS) \
         theme
@@ -201,5 +203,6 @@
 	    -e 's/^_Description=/Description=/' \
 	    -e 's/^_Author=/Author=/' \
 	$< > $@
+endif
 
-EXTRA_DIST = $(pidginsmileypix_DATA) $(pidginsmileypix_in_files)
+EXTRA_DIST = $(SMILEYS) $(pidginsmileypix_in_files) theme
diff -r 25d34ee59435 -r e4b2cbc246da pidgin/pixmaps/emotes/none/Makefile.am
--- a/pidgin/pixmaps/emotes/none/Makefile.am	Sat Mar 29 19:14:17 2008 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.am	Sun Mar 30 00:19:07 2008 +0000
@@ -1,5 +1,7 @@
+pidginsmileypix_in_files = none.theme.in
+
+if INSTALL_PIXMAPS
 pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none
-pidginsmileypix_in_files = none.theme.in
 pidginsmileypix_DATA = theme
 
 theme: none.theme.in
@@ -7,7 +9,9 @@
 	    -e 's/^_Description=/Description=/' \
 	    -e 's/^_Author=/Author=/' \
 	$< > $@
+endif
 
-EXTRA_DIST = $(pidginsmileypix_DATA) \
+EXTRA_DIST = \
 	$(pidginsmileypix_in_files) \
-	Makefile.mingw
+	Makefile.mingw \
+	theme