[Pkg-wmaker-commits] [wmfsm] 26/83: wmfsm: Add --with-xpm option to configure to select appearance at compile time.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfsm.

commit 1bcc7a1685f5564356f04a10dace0cbae17667d1
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Jan 22 00:22:12 2015 -0600

    wmfsm: Add --with-xpm option to configure to select appearance at compile time.
    
    Note that wmfsm/wmfsm_master.xpm has been removed, as it is now created as a
    symlink during configure.  It is also removed by "make clean".
---
 configure.ac           |  19 +++++
 wmfsm/Makefile.am      |   3 +-
 wmfsm/wmfsm_master.xpm | 186 -------------------------------------------------
 3 files changed, 21 insertions(+), 187 deletions(-)

diff --git a/configure.ac b/configure.ac
index c03da17..6f793dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,5 +57,24 @@ AC_CHECK_FUNCS(gethostname strcspn strdup strspn strstr statfs)
 AC_CHECK_FUNCS(getopt_long, have_getopt=true)
 AM_CONDITIONAL(GETOPT, test x$have_getopt = xtrue)
 
+dnl Set default XPM
+define([xpmlist], esyscmd([find wmfsm/ -name 'wmfsm_master_*.xpm' -exec basename {} .xpm \;| sed 's/wmfsm_master_//']))
+AC_ARG_WITH([xpm],
+	AS_HELP_STRING([--with-xpm],
+	[Configure wmfsm to use specified xpm file for appearance. Defaults to
+	'highcolor'. Choices are: ]
+	xpmlist),
+	[],
+        [with_xpm=highcolor])
+
+xpm="wmfsm/wmfsm_master_${with_xpm}.xpm"
+if test ! -e "${xpm}"; then
+   AC_MSG_ERROR([Cannot find xpm file '${xpm}'.])
+fi
+
+echo "configuring for ${with_xpm} appearance..."
+rm -f wmfsm/wmfsm_master.xpm
+ln -sr ${xpm} wmfsm/wmfsm_master.xpm
+
 AC_OUTPUT(Makefile wmfsm/Makefile wmgeneral/Makefile)
 
diff --git a/wmfsm/Makefile.am b/wmfsm/Makefile.am
index 8ab21a0..cf8d271 100644
--- a/wmfsm/Makefile.am
+++ b/wmfsm/Makefile.am
@@ -6,5 +6,6 @@ wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
 endif
 wmfsm_LDADD = ../wmgeneral/libwmgeneral.a @LIBS@ @X11LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
 man_MANS = wmfsm.1
-EXTRA_DIST = $(man_MANS) wmfsm_master.xpm wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample
+EXTRA_DIST = $(man_MANS) wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm wmfsm_master_lowcolor.xpm wmfsm_mask.xbm wmfsmrc.sample
+CLEANFILES = wmfsm_master.xpm
 
diff --git a/wmfsm/wmfsm_master.xpm b/wmfsm/wmfsm_master.xpm
deleted file mode 100644
index 7140851..0000000
--- a/wmfsm/wmfsm_master.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * wmfsm_master_xpm[] = {
-"134 128 55 1",
-" 	c None",
-".	c #000000",
-"+	c #20B2AE",
-"@	c #00FF00",
-"#	c #09FF00",
-"$	c #13FF00",
-"%	c #1DFF00",
-"&	c #27FF00",
-"*	c #31FF00",
-"=	c #3AFF00",
-"-	c #44FF00",
-";	c #4EFF00",
-">	c #58FF00",
-",	c #62FF00",
-"'	c #6BFF00",
-")	c #75FF00",
-"!	c #7FFF00",
-"~	c #89FF00",
-"{	c #93FF00",
-"]	c #9CFF00",
-"^	c #A6FF00",
-"/	c #B0FF00",
-"(	c #BAFF00",
-"_	c #C4FF00",
-":	c #CDFF00",
-"<	c #D7FF00",
-"[	c #E1FF00",
-"}	c #EBFF00",
-"|	c #F5FF00",
-"1	c #FFFF00",
-"2	c #FFF500",
-"3	c #FFEB00",
-"4	c #FFE100",
-"5	c #FFD700",
-"6	c #FFCD00",
-"7	c #FFC400",
-"8	c #FFBA00",
-"9	c #FFB000",
-"0	c #FFA600",
-"a	c #FF9C00",
-"b	c #FF9300",
-"c	c #FF8900",
-"d	c #FF7F00",
-"e	c #FF7500",
-"f	c #FF6B00",
-"g	c #FF6200",
-"h	c #FF5800",
-"i	c #FF4E00",
-"j	c #FF4400",
-"k	c #FF3A00",
-"l	c #FF3100",
-"m	c #FF2700",
-"n	c #FF1D00",
-"o	c #FF1300",
-"p	c #FF0900",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"...................................................................++..+++...+++.+++..++++.++++..++....+..............................",
-"..................................................................+..+.+..+.+....+..+.+....+....+..+..++..............................",
-"..................................................................++++.+++..+....+..+.+++..+++..+..+...+..............................",
-"..................................................................+..+.+..+.+....+..+.+....+....+..+...+..............................",
-"..................................................................+..+.+++...+++.+++..++++.+.....++...+++.............................",
-"...................................................................+++.+..+..+++.++++.+..+.+.....++..+++..............................",
-"..................................................................+....+..+...+.....+.+.+..+....+..+....+.............................",
-"..................................................................+.++.++++...+.....+.++...+......+...++..............................",
-"..................................................................+..+.+..+...+..+..+.+.+..+.....+......+.............................",
-"...................................................................++..+..+..+++..++..+..+.++++.++++.+++..............................",
-"...................................................................+++.+..+..++..+++...++..+++..+....++++.............................",
-"..................................................................+.+.+++.+.+..+.+..+.+..+.+..+.+.+..+................................",
-"..................................................................+.+.+++++.+..+.+++..+..+.+++..++++.+++..............................",
-"..................................................................+...++.++.+..+.+....+.++.+.+....+.....+.............................",
-"..................................................................+...++..+..++..+.....+++.+..+...+..+++..............................",
-"...................................................................+++..+++.+..+.+..+.+...++..+..++...+++.............................",
-"..................................................................+......+..+..+.+..+.+...++..+.+.......+.............................",
-"...................................................................++....+..+..+..++..+.+.+.++..+++.....+.............................",
-".....................................................................+...+..+..+..++..+.+.++..+.+..+....+.............................",
-"..................................................................+++....+...++....+...+.+.+..+..++.....+.............................",
-"..................................................................+..+.++++.....+................++...++..............................",
-"..................................................................+..+....+....+................+..+.+..+.............................",
-"...................................................................++....+....+.......++++.......++...+++.............................",
-"....................................................................+...+....+..............++..+..+....+.............................",
-"....................................................................+..++++.+....+++++......++...++...++..............................",
-"..................................................................@#$%&*=-;>,')!~{]^/(_:<[}|1234567890abcdefghijklmnop................",
-"..................................................................@#$%&*=-;>,')!~{]^/(_:<[}|1234567890abcdefghijklmnop................",
-"..................................................................@#$%&*=-;>,')!~{]^/(_:<[}|1234567890abcdefghijklmnop................",
-"..................................................................@#$%&*=-;>,')!~{]^/(_:<[}|1234567890abcdefghijklmnop................",
-"..................................................................@#$%&*=-;>,')!~{]^/(_:<[}|1234567890abcdefghijklmnop................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................",
-"......................................................................................................................................"};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfsm.git