pidgin: 53cb1e1c: I'm tired of installing pixmap data that...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 53cb1e1c1d3135d2292f77aa110d3ed86d9804c9
Ancestor: 4d5d462bb391058d9f4c4a151c41b0dcb94b63da
Author: rekkanoryo at pidgin.im
Date: 2008-03-30T00:19:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/53cb1e1c1d3135d2292f77aa110d3ed86d9804c9

Modified files:
        configure.ac pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/buddy_icons/qq/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/none/Makefile.am

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- configure.ac	32415640c288407ad7b767c2308aae7d6917a5e1
+++ configure.ac	e01c0fb282cafc07e9f649115d05ba9c082b7d3b
@@ -2144,6 +2144,13 @@ dnl ####################################
 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 Use external libzephyr........ : $z
 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
============================================================
--- pidgin/pixmaps/Makefile.am	78b4732370810d6efb27acd01a970cb1e5b1af17
+++ pidgin/pixmaps/Makefile.am	01e3beec83e93cb1800639138b30358cb1729b80
@@ -3,6 +3,7 @@ SUBDIRS = buddy_icons/qq emotes/default/
 
 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 @@ nobase_dist_pidginicons_DATA = \
 		$(ICONS_24) \
 		$(ICONS_32) \
 		$(ICONS_48)
+endif
============================================================
--- pidgin/pixmaps/buddy_icons/qq/Makefile.am	2b10bacce3c1813be14de9da2b8943e0158911a0
+++ pidgin/pixmaps/buddy_icons/qq/Makefile.am	9266c638f8e505df41b0b6b5cae17e71f0f2853a
@@ -100,6 +100,8 @@ EXTRA_DIST = \
 	qq_99.png \
 	qq_100.png
 
+if INSTALL_PIXMAPS
 qqbuddyiconspixdir = $(datadir)/pixmaps/purple/buddy_icons/qq
 
 qqbuddyiconspix_DATA = $(EXTRA_DIST)
+endif
============================================================
--- pidgin/pixmaps/emotes/default/24/Makefile.am	5d46b4431753d4892682d91a53e97b12e60916de
+++ pidgin/pixmaps/emotes/default/24/Makefile.am	46bcc81d61a778a9795a9fe3c36a4a36bc12beb6
@@ -190,8 +190,10 @@ SMILEYS = 	act-up.png \
     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 @@ theme: default.theme.in
 	    -e 's/^_Description=/Description=/' \
 	    -e 's/^_Author=/Author=/' \
 	$< > $@
+endif
 
+EXTRA_DIST = $(SMILEYS) $(pidginsmileypix_in_files) theme
-EXTRA_DIST = $(pidginsmileypix_DATA) $(pidginsmileypix_in_files)
============================================================
--- pidgin/pixmaps/emotes/none/Makefile.am	673cfd7470b75604a34dece525e7bcfddf5a5000
+++ pidgin/pixmaps/emotes/none/Makefile.am	25f809369376193ebc5d36ab4ea56143818e8f33
@@ -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 @@ theme: none.theme.in
 	    -e 's/^_Description=/Description=/' \
 	    -e 's/^_Author=/Author=/' \
 	$< > $@
+endif
 
-EXTRA_DIST = $(pidginsmileypix_DATA) \
+EXTRA_DIST = \
 	$(pidginsmileypix_in_files) \
+	Makefile.mingw \
+	theme
-	Makefile.mingw