diff --git a/fvwm-2.5.26-gcc-warnings.patch b/fvwm-2.5.26-gcc-warnings.patch
index 8aa1ccf..2395746 100644
--- a/fvwm-2.5.26-gcc-warnings.patch
+++ b/fvwm-2.5.26-gcc-warnings.patch
@@ -9,14 +9,3 @@
int i;
Bool do_iconv = True;
const char *bidi_charset;
---- fvwm/infostore.c
-+++ fvwm/infostore.c 2012-02-07 09:40:19.454433548 +0000
-@@ -58,7 +58,7 @@ MetaInfo *new_metainfo(void)
- {
- /* Initialise the main store. */
- mi_store = (MetaInfo *)safemalloc(sizeof(MetaInfo));
-- memset(&mi_store, '\0', sizeof(MetaInfo));
-+ memset(mi_store, '\0', sizeof(MetaInfo));
- }
-
- mi = (MetaInfo *)safemalloc(sizeof(MetaInfo));
diff --git a/fvwm-2.6.4.tar.bz2 b/fvwm-2.6.4.tar.bz2
deleted file mode 100644
index dbcd428..0000000
--- a/fvwm-2.6.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebf217cfcd19559559b330d8e1e8e49422dbfc0bc5340c146de8e7355bdc6f11
-size 2608895
diff --git a/fvwm-2.6.5.tar.bz2 b/fvwm-2.6.5.tar.bz2
new file mode 100644
index 0000000..ed336ed
--- /dev/null
+++ b/fvwm-2.6.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf
+size 2582655
diff --git a/fvwm-menu-desktop-config.fpl b/fvwm-menu-desktop-config.fpl
new file mode 100644
index 0000000..4c2aee5
--- /dev/null
+++ b/fvwm-menu-desktop-config.fpl
@@ -0,0 +1,286 @@
+# Uage: Module FvwmPerl -l fvwm-menu-desktop-config.fpl
+
+# This script generates an FvwmForm similar to the FvwmForm-Desktop by
+# Dan Espen but inserts the found xdg menus dynamically into the Form
+# before processed.
+# Author: Thomas Funk <t.funk@web.de>
+# Version: 1.3
+
+package MenuConfig;
+use File::Basename;
+use strict;
+use warnings;
+
+#open(MSG ,">>/tmp/log.txt") || die "Error $!";
+
+my $modname = 'FvwmForm-Desktop-Config';
+my $all = `fvwm-menu-desktop --get-menus all`;
+my $selected = `fvwm-menu-desktop --get-menus desktop`;
+
+my @all_filelist = split(/ /,$all);
+my @selected_filelist = split(/ /,$selected);
+
+my %all_menus = ();
+my %selected__menus = ();
+my $max_length = 0;
+foreach my $path (@selected_filelist) {
+ my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
+ push (@{$selected__menus{$directories}}, $filename);
+}
+
+my $i = 1;
+foreach my $path (@all_filelist) {
+ my $name = "MEN" . $i;
+ # qr matched against the end of the $filename.
+ # The matching portion is removed and becomes the $suffix.
+ my ($filename, $directories, $suffix) = fileparse($path, qr/\.[^.]*/);
+ push (@{$all_menus{$directories}{$i}}, ($filename, $name, "off"));
+ next if !defined $selected__menus{$directories};
+ foreach my $hit (@{$selected__menus{$directories}}) {
+ if ($filename eq $hit) {
+ pop (@{$all_menus{$directories}{$i}});
+ push (@{$all_menus{$directories}{$i}}, "on");
+ }
+ }
+ $max_length = length($filename) if ($max_length < length($filename));
+ $i++;
+}
+
+my $fvwmform_commands = "
+DestroyModuleConfig ${modname}: *
+*${modname}: Title \"\$[gt.Fvwm Menu Desktop Config]\"
+*${modname}: WarpPointer
+*${modname}: Line center
+*${modname}: Text \"\$[gt.Fvwm Menu Desktop Config]\"
+*${modname}: Line
+*${modname}: Separator
+*${modname}: Line center
+*${modname}: Text \"\$[gt.Multiple Menu]\"
+*${modname}: Line
+";
+
+if (scalar keys %all_menus != 0) {
+ foreach my $key (sort( keys %all_menus)) {
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Text \"\$[gt.Menus in]\"
+ *${modname}: Text \" $key\"
+ *${modname}: Line left
+ *${modname}: Selection meth multiple
+ ";
+ my $m_count = 0;
+ foreach my $count (sort(keys %{$all_menus{$key}})) {
+ my @menu = @{$all_menus{$key}{$count}};
+ my $newstring = $menu[0] . ' ' x eval($max_length-length($menu[0]));
+ $fvwmform_commands .= "*${modname}: Choice $menu[1] $menu[1] $menu[2] \"$newstring\"
+ ";
+ $m_count++;
+ if ($m_count == 3) {
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Selection meth multiple
+ ";
+ $m_count = 0;
+ }
+ }
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Text \" \"
+ ";
+ }
+}
+else {
+ $fvwmform_commands .= "
+ *${modname}: Line center
+ *${modname}: Text \"\$[gt.No menus found! Check why from within a terminal with]\"
+ *${modname}: Line center
+ *${modname}: Text \"'fvwm-menu-desktop -v'\"
+ *${modname}: Line left
+ *${modname}: Text \" \"
+ ";
+}
+
+$fvwmform_commands .= "
+*${modname}: Line
+*${modname}: Separator
+*${modname}: Line center
+*${modname}: Text \"\$[gt.General Options]\"
+*${modname}: Line
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.Use Icons in Menus? ]\"
+*${modname}: Selection SelItype single
+*${modname}: Choice IconsOn IconsOn on \"\$[gt.Yes]\"
+*${modname}: Choice IconsOff IconsOff off \"\$[gt.No]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Icon size: ]\"
+*${modname}: Input Size 2 \"\"
+*${modname}: Text \"\$[gt. (in pixels. Default is 24)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Converted Icon directory: ]\"
+*${modname}: Input IconDir 25 \"~/.fvwm/icons\"
+*${modname}: Text \"\$[gt. (Directory for converted icons)]\"
+
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.Use Titles in Menus? ]\"
+*${modname}: Selection SelItype single
+*${modname}: Choice TitlesOn TitlesOn on \"\$[gt.Yes]\"
+*${modname}: Choice TitlesOff TitlesOff off \"\$[gt.No]\"
+
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.Insert Menu(s) in a Menu? ]\"
+*${modname}: Selection SelItype single
+*${modname}: Choice InsertOn InsertOn off \"\$[gt.Yes]\"
+*${modname}: Choice InsertOff InsertOff on \"\$[gt.No]\"
+*${modname}: Text \"\$[gt.Top title name: ]\"
+*${modname}: Input InMenu 20 \"\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Used Icon theme: ]\"
+*${modname}: Input Theme 20 \"\"
+*${modname}: Text \"\$[gt. (Theme name for icon selection)]\"
+
+*${modname}: Line left
+*${modname}: Line
+*${modname}: Line
+*${modname}: Separator
+*${modname}: Line center
+*${modname}: Text \"\$[gt.Single Menu]\"
+*${modname}: Line
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.If you want a single menu only deselect all menus above and fill out]\"
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.the fields below. But remember, if the menu doesn't exist, nothing happens.]\"
+
+*${modname}: Line
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Menu Top Title:]\"
+*${modname}: Input Title 20 \"\"
+*${modname}: Text \"\$[gt. (Eg. FvwmTestMenu)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Install-Prefix:]\"
+*${modname}: Input Installprefix 20 \"\"
+*${modname}: Text \"\$[gt. (Eg. /etc/xdg/menus/)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Desktop: ]\"
+*${modname}: Input Desktop 20 \"\"
+*${modname}: Text \"\$[gt. (Eg. gnome, kde, xfce, lxde)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Menutype: ]\"
+*${modname}: Input Menutype 20 \"\"
+*${modname}: Text \"\$[gt. (Eg. applications, settings)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Output path: ]\"
+*${modname}: Input Path 25 \"\$FVWM_USERDIR/.menu\"
+*${modname}: Text \"\$[gt. (Full path to store output)]\"
+
+*${modname}: Line left
+*${modname}: Line
+*${modname}: Line
+*${modname}: Separator
+*${modname}: Line center
+*${modname}: Text \"\$[gt.Actions]\"
+*${modname}: Line left
+*${modname}: Line
+*${modname}: Line center
+*${modname}: Selection SelItype single
+*${modname}: Choice MultiOn MultiOn on \"\$[gt.Multiple]\"
+*${modname}: Choice MultiOff MultiOff off \"\$[gt.Single]\"
+*${modname}: Line
+*${modname}: Separator
+*${modname}: Line expand
+*${modname}: Button continue \"\$[gt.Generate Menu(s)]\"
+*${modname}: Command PipeRead 'fvwm-menu-desktop \\
+\$(IconsOn\?--enable-mini-icons )\\
+\$(Size\?-s \$(Size) )\\
+\$(TitlesOn\?--with-titles )\\
+\$(InsertOn\?--insert-in-menu \$(InMenu) )\\
+\$(IconDir\?--mini-icon-dir \$(IconDir) )\\
+\$(Title\?--title \$(Title) )\\
+\$(Installprefix\?--install-prefix \$(Installprefix) )\\
+\$(Desktop\?--desktop \$(Desktop) )\\
+\$(Menutype\?--menutype \$(Menutype) )\\
+\$(Theme\?--theme \$(Theme) )\\
+\$(MultiOn\?--set-menus \"\\
+";
+
+foreach my $key (keys %all_menus) {
+ foreach my $file (keys %{$all_menus{$key}}) {
+ my @menu = @{$all_menus{$key}{$file}};
+ $fvwmform_commands .= "\$($menu[1]\?$key$menu[0].menu )\\\n";
+ }
+}
+
+$fvwmform_commands .= "\") \$(Path\? > \$(Path)) 2> ~/.xsession-errors && echo \"Read \$(Path\? \$(Path))\"'
+
+*${modname}: Button continue \"\$[gt.Save Settings]\"
+
+# Before saving the data, remove any previously saved data:
+*${modname}: Command DestroyModuleConfig ${modname}Default: *
+*${modname}: Command !( /bin/echo \\
+ \"# This file last created by ${modname} on: `/bin/date`.\"; /bin/echo \\
+";
+
+foreach my $key (keys %all_menus) {
+ foreach my $count (keys %{$all_menus{$key}}) {
+ my @menu = @{$all_menus{$key}{$count}};
+ $fvwmform_commands .= " '*${modname}Default: $menu[1] \$($menu[1]\?on) ' ; /bin/echo \\
+ ";
+ }
+}
+
+$fvwmform_commands .= ") > \$FVWM_USERDIR/.${modname}
+
+*${modname}: Command !( /bin/echo \\
+ '*${modname}Default: IconsOn \$(IconsOn\?on) ' ; /bin/echo \\
+ '*${modname}Default: IconsOff \$(IconsOff\?on) ' ; /bin/echo \\
+ '*${modname}Default: Size \$(Size) ' ; /bin/echo \\
+ '*${modname}Default: TitlesOn \$(TitlesOn\?on) ' ; /bin/echo \\
+ '*${modname}Default: TitlesOff \$(TitlesOff\?on) ' ; /bin/echo \\
+ '*${modname}Default: InsertOn \$(InsertOn\?on) ' ; /bin/echo \\
+ '*${modname}Default: InsertOff \$(InsertOff\?on) ' ; /bin/echo \\
+ '*${modname}Default: InMenu \$(InMenu) ' ; /bin/echo \\
+ '*${modname}Default: Theme \$(Theme) ' \\
+) >> \$FVWM_USERDIR/.${modname}
+
+*${modname}: Command !( /bin/echo \\
+ '*${modname}Default: Title \$(Title) ' ; /bin/echo \\
+ '*${modname}Default: Installprefix \$(Installprefix) ' ; /bin/echo \\
+ '*${modname}Default: Desktop \$(Desktop) ' ; /bin/echo \\
+ '*${modname}Default: Menutype \$(Menutype) ' ; /bin/echo \\
+ '*${modname}Default: Path \$(Path) ' ; /bin/echo \\
+ '*${modname}Default: IconDir \$(IconDir) ' ; /bin/echo \\
+ '*${modname}Default: MultiOn \$(MultiOn\?on) ' ; /bin/echo \\
+ '*${modname}Default: MultiOff \$(MultiOff\?on) ' \\
+) >> \$FVWM_USERDIR/.${modname}
+
+*${modname}: Button restart \"\$[gt.Reset]\"
+*${modname}: Command Nop
+*${modname}: Button continue \"\$[gt.Help]\"
+*${modname}: Command Exec exec xterm -g 100x50 -n \"Help fvwm-menu-desktop\" -T \"Help fvwm-menu-desktop\" -e \"man fvwm-menu-desktop\" &
+*${modname}: Button quit \"\$[gt.Quit]\"
+*${modname}: Command Nop
+
+# Tell ${modname} to read vars from .${modname}Default file:
+*${modname}: UseData .${modname} *${modname}Default
+";
+
+# We are just asked to open a window, give fvwm a chance to do it
+::unlock();
+
+$fvwmform_commands =~ s/^\s+//; # trim leading whitespace
+
+::command(qq[
+ $fvwmform_commands
+ FvwmForm ${modname}
+]);
+#print MSG "$fvwmform_commands\n\n";
+#close(MSG);
+# Local Variables:
+# mode: perl
+# End:
diff --git a/fvwm-rsvg.patch b/fvwm-rsvg.patch
new file mode 100644
index 0000000..47a7ba5
--- /dev/null
+++ b/fvwm-rsvg.patch
@@ -0,0 +1,30 @@
+--- configure
++++ configure 2013-07-18 11:31:57.449439339 +0000
+@@ -9461,7 +9461,6 @@ else
+ /* end confdefs.h. */
+
+ #include <librsvg/rsvg.h>
+- #include <librsvg/rsvg-cairo.h>
+ int main() {
+ RsvgHandle *rsvg;
+ g_type_init();
+--- configure.ac
++++ configure.ac 2013-07-18 11:32:12.985439431 +0000
+@@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then
+ LIBS="$LIBS $rsvg_LIBS"
+ AC_TRY_RUN([
+ #include <librsvg/rsvg.h>
+- #include <librsvg/rsvg-cairo.h>
+ int main() {
+ RsvgHandle *rsvg;
+ g_type_init();
+--- libs/Fsvg.h
++++ libs/Fsvg.h 2013-07-18 11:31:31.785438953 +0000
+@@ -15,7 +15,6 @@
+
+ #if USE_SVG
+ # include <librsvg/rsvg.h>
+-# include <librsvg/rsvg-cairo.h>
+
+ typedef RsvgDimensionData FRsvgDimensionData;
+ typedef RsvgHandle FRsvgHandle;
diff --git a/fvwm-snapshot.patch b/fvwm-snapshot.patch
new file mode 100644
index 0000000..b395a39
--- /dev/null
+++ b/fvwm-snapshot.patch
@@ -0,0 +1,14476 @@
+|
+| This is a patch set based on snapshot 2012/10/11
+|
+--- ChangeLog
++++ ChangeLog 2012-07-31 04:37:42.000000000 +0000
+@@ -1,3 +1,38 @@
++2012-07-30 Dan Espen <despen@verizon.net>
++
++ * NEWS: Added FvwmForm Separators,
++ fvwm-desktop-menu fixes.
++
++2012-06-22 Dan Espen <despen@verizon.net>
++
++ * configure.ac: Set variables for python.
++
++2012-06-16 Thomas Adam <thomas@fvwm.org>
++ * configure.ac:
++ * libs/Bindings.c (AddBinding):
++ * fvwm/builtins.c (FkeysymToKeycode):
++ * fvwm/events.c (__handle_key):
++ Add detection of XKeycodeToKeysym as deprecated, and provide a wrapper
++ for it by way of fvwm_KeycodeToKeysym() to call the newer
++ XkbKeycodeToKeysum() where needed.
++
++
++2012-05-04 Thomas Adam <thomas@fvwm.org>
++ * libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
++ PImageLoadPng):
++ Fix compilation errors.
++
++2012-05-02 Thomas Adam <thomas@fvwm.org>
++ * fvwm/menu.c ( __scan_for_pixmap):
++ * libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
++ PImageLoadPng):
++ Add fvwm_msg() for hints about failed image load.
++
++2012-04-20 Thomas Adam <thomas@fvwm.org>
++ * NEWS:
++ * configure.ac:
++ Updated for 2.6.6 (CVS HEAD)
++
+ 2012-04-20 Thomas Adam <thomas@fvwm.org>
+ * configure.ac:
+ * docs/ANNOUNCE:
+--- Makefile.in
++++ Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -58,6 +75,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -70,9 +92,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+- { test ! -d "$(distdir)" \
+- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr "$(distdir)"; }; }
++ if test -d "$(distdir)"; then \
++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -rf "$(distdir)" \
++ || { sleep 5 && rm -rf "$(distdir)"; }; \
++ else :; fi
+ am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+@@ -101,6 +125,8 @@ am__relativize = \
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -215,6 +241,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -289,11 +320,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -368,7 +403,7 @@ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh:
++am--refresh: Makefile
+ @:
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+@@ -404,10 +439,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+- @if test ! -f $@; then \
+- rm -f stamp-h1; \
+- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+- else :; fi
++ @if test ! -f $@; then rm -f stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+@@ -589,13 +622,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -627,7 +657,11 @@ dist-gzip: distdir
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-lzip: distdir
++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__remove_distdir)
+
+ dist-lzma: distdir
+@@ -635,7 +669,7 @@ dist-lzma: distdir
+ $(am__remove_distdir)
+
+ dist-xz: distdir
+- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+@@ -666,6 +700,8 @@ distcheck: dist
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
++ *.tar.lz*) \
++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+@@ -675,7 +711,7 @@ distcheck: dist
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+- chmod -R a-w $(distdir); chmod a+w $(distdir)
++ chmod -R a-w $(distdir); chmod u+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+@@ -685,6 +721,7 @@ distcheck: dist
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -713,8 +750,16 @@ distcheck: dist
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @$(am__cd) '$(distuninstallcheck_dir)' \
+- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++ @test -n '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: trying to run $@ with an empty' \
++ '$$(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ $(am__cd) '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+@@ -745,10 +790,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+@@ -835,17 +885,18 @@ uninstall-am:
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+- distclean distclean-generic distclean-hdr distclean-tags \
+- distcleancheck distdir distuninstallcheck dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
++ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
++ distcheck distclean distclean-generic distclean-hdr \
++ distclean-tags distcleancheck distdir distuninstallcheck dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am
+
+
+ dist2: dist
+--- NEWS
++++ NEWS 2012-07-31 04:37:43.000000000 +0000
+@@ -2,7 +2,21 @@ Note, the changes for the last STABLE re
+ 2.6.0.
+
+ -------------------------------------------------------------------
+-Changes in CVS HEAD (20-Apr-2012)
++Changes in 2.6.6 ()
++
++* New features:
++ - FvwmForm supports separator lines.
++
++* Bug fixes:
++ - Provide a wrapper for the deprecation of XKeycodeToKeysym and
++ use XkbKeycodeToKeysym() where appropriate.
++ - fvwm-desktop-menu is re-written and provides better support of
++ the XDG menu specification.
++
++-------------------------------------------------------------------
++
++-------------------------------------------------------------------
++Changes in 2.6.5 (20-Apr-2012)
+
+ * New features:
+ - FvwmPager now wraps window names if SmallFont is set.
+--- aclocal.m4
++++ aclocal.m4 2012-10-11 18:46:18.000000000 +0000
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,12 +20,15 @@ You have another version of autoconf. I
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11.6], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 10
++# serial 12
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $dep
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $dep
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ AC_SUBST([AMDEPBACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+@@ -557,12 +567,15 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+@@ -694,12 +707,15 @@ else
+ fi
+ ])
+
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check for `mkdir -p'.
+@@ -722,13 +738,14 @@ esac
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 5
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -736,13 +753,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+ # _AM_SET_OPTION(NAME)
+-# ------------------------------
++# --------------------
+ # Set option NAME. Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+ # _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
++# ------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+@@ -753,6 +770,228 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
++# 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# ---------------------------------------------------------------------------
++# Adds support for distributing Python modules and packages. To
++# install modules, copy them to $(pythondir), using the python_PYTHON
++# automake variable. To install a package with the same name as the
++# automake package, install to $(pkgpythondir), or use the
++# pkgpython_PYTHON automake variable.
++#
++# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
++# locations to install python extension modules (shared libraries).
++# Another macro is required to find the appropriate flags to compile
++# extension modules.
++#
++# If your package is configured with a different prefix to python,
++# users will have to add the install directory to the PYTHONPATH
++# environment variable, or create a .pth file (see the python
++# documentation for details).
++#
++# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
++# cause an error if the version of python installed on the system
++# doesn't meet the requirement. MINIMUM-VERSION should consist of
++# numbers and dots only.
++AC_DEFUN([AM_PATH_PYTHON],
++ [
++ dnl Find a Python interpreter. Python versions prior to 2.0 are not
++ dnl supported. (2.0 was released on October 16, 2000).
++ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
++[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
++ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
++
++ AC_ARG_VAR([PYTHON], [the Python interpreter])
++
++ m4_if([$1],[],[
++ dnl No version check is needed.
++ # Find any Python interpreter.
++ if test -z "$PYTHON"; then
++ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
++ fi
++ am_display_PYTHON=python
++ ], [
++ dnl A version check is needed.
++ if test -n "$PYTHON"; then
++ # If the user set $PYTHON, use it and don't search something else.
++ AC_MSG_CHECKING([whether $PYTHON version >= $1])
++ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
++ [AC_MSG_RESULT(yes)],
++ [AC_MSG_ERROR(too old)])
++ am_display_PYTHON=$PYTHON
++ else
++ # Otherwise, try each interpreter until we find one that satisfies
++ # VERSION.
++ AC_CACHE_CHECK([for a Python interpreter with version >= $1],
++ [am_cv_pathless_PYTHON],[
++ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
++ test "$am_cv_pathless_PYTHON" = none && break
++ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
++ done])
++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
++ if test "$am_cv_pathless_PYTHON" = none; then
++ PYTHON=:
++ else
++ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
++ fi
++ am_display_PYTHON=$am_cv_pathless_PYTHON
++ fi
++ ])
++
++ if test "$PYTHON" = :; then
++ dnl Run any user-specified action, or abort.
++ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
++ else
++
++ dnl Query Python for its version number. Getting [:3] seems to be
++ dnl the best way to do this; it's what "site.py" does in the standard
++ dnl library.
++
++ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
++ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
++ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
++
++ dnl Use the values of $prefix and $exec_prefix for the corresponding
++ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
++ dnl distinct variables so they can be overridden if need be. However,
++ dnl general consensus is that you shouldn't need this ability.
++
++ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
++ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++
++ dnl At times (like when building shared libraries) you may want
++ dnl to know which OS platform Python thinks this is.
++
++ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
++ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
++ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
++
++
++ dnl Set up 4 directories:
++
++ dnl pythondir -- where to install python scripts. This is the
++ dnl site-packages directory, not the python standard library
++ dnl directory like in previous automake betas. This behavior
++ dnl is more consistent with lispdir.m4 for example.
++ dnl Query distutils for this directory.
++ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
++ [am_cv_python_pythondir],
++ [if test "x$prefix" = xNONE
++ then
++ am_py_prefix=$ac_default_prefix
++ else
++ am_py_prefix=$prefix
++ fi
++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
++ case $am_cv_python_pythondir in
++ $am_py_prefix*)
++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
++ esac
++ ])
++ AC_SUBST([pythondir], [$am_cv_python_pythondir])
++
++ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
++ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
++ dnl more consistent with the rest of automake.
++
++ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
++
++ dnl pyexecdir -- directory for installing python extension modules
++ dnl (shared libraries)
++ dnl Query distutils for this directory.
++ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
++ [am_cv_python_pyexecdir],
++ [if test "x$exec_prefix" = xNONE
++ then
++ am_py_exec_prefix=$am_py_prefix
++ else
++ am_py_exec_prefix=$exec_prefix
++ fi
++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
++ case $am_cv_python_pyexecdir in
++ $am_py_exec_prefix*)
++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
++ esac
++ ])
++ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
++
++ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
++
++ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
++
++ dnl Run any user-specified action.
++ $2
++ fi
++
++])
++
++
++# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
++# ---------------------------------------------------------------------------
++# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
++# Run ACTION-IF-FALSE otherwise.
++# This test uses sys.hexversion instead of the string equivalent (first
++# word of sys.version), in order to cope with versions such as 2.2c1.
++# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
++AC_DEFUN([AM_PYTHON_CHECK_VERSION],
++ [prog="import sys
++# split strings by '.' and convert to numeric. Append some zeros
++# because we need at least 4 digits for the hex conversion.
++# map returns an iterator in Python 3.0 and a list in 2.x
++minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
++minverhex = 0
++# xrange is not present in Python 3.0 and range returns an iterator
++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
++sys.exit(sys.hexversion < minverhex)"
++ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
++
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 1
++
++# AM_RUN_LOG(COMMAND)
++# -------------------
++# Run COMMAND, save the exit status in ac_status, and log it.
++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
++AC_DEFUN([AM_RUN_LOG],
++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ (exit $ac_status); }])
++
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+@@ -818,12 +1057,14 @@ Check your system clock])
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_STRIP
+ # ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+@@ -846,13 +1087,13 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+@@ -861,13 +1102,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+ # AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
++# --------------------------
+ # Public sister of _AM_SUBST_NOTMAKE.
+ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+ # Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -889,10 +1130,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_
+ # a tarball read from stdin.
+ # $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
++[# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+--- bin/ChangeLog
++++ bin/ChangeLog 2012-10-03 16:59:38.000000000 +0000
+@@ -1,3 +1,88 @@
++2012-10-03 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in: Unicode support from Thomas Funk.
++
++2012-09-02 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.1.in: Applied patches from Thomas Funk
++ with some minor changes.
++ * fvwm-menu-desktop-config.fpl:
++ * fvwm-menu-desktop.in:
++
++2012-07-28 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop-config.fpl: New module Thomas Funk.
++ Some changes. Got conflicts with old FvwmForm so changed name.
++
++ * Makefile.am: Add fvwm-menu-desktop-config.fpl.
++
++ * fvwm-menu-desktop.in (main): Applied patch from Thomas Funk.
++ Menus in users HOME only override /etc/xdg/menus.
++
++2012-07-27 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.1.in: Applied patch from Thomas Funk.
++ Capitalize titles, remove dashes from titles.
++
++2012-07-24 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.1.in: Latest patches from Thomas Funk with
++ some adjustments.
++
++2012-07-21 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.1.in: Applied patch from Thomas Funk.
++ Some changes.
++
++2012-07-19 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in (main): Change --get-menus option to all/desktop.
++ Add validation.
++
++ * fvwm-menu-desktop.1.in: Applied patch from Thomas Funk.
++ Functionality for configuration tool for fvwm-menu-desktop.
++ Two new options:
++ - get-menus [selected, all] to send the found menus to the config gui
++ - set-menus [filelist] to tell fvwm-menu-desktop which menus should be
++ built.
++ Also another option --insert-in-menu NAME.
++
++
++2012-07-12 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in: Applied patch from Thomas Funk.
++ Menu titles. Verbose fixups. Build all menus by default.
++
++2012-07-11 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.1.in: First pass on new man page.
++ * fvwm-menu-desktop.in: Set #! correctly.
++
++2012-06-29 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in: fix usage.
++
++2012-06-26 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in:
++ Apply rest Thomas Funk patch 1 and 2.
++ change --desktop to xfe, gnome.
++ add --menu-type application.
++
++2012-06-24 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in (main): When root menu doesn't exist,
++ print a clear error message and exit.
++ (parsemenu): Eliminate %U in exec strings
++ (parsemenu): Use printtext.
++ (geticonfile): run mkdir for users icon cache.
++ Based on Patch 1 from Thomas Funk.
++
++2012-06-22 Dan Espen <despen@verizon.net>
++
++ * fvwm-menu-desktop.in:
++ Rewrite using python and xdg libs.
++
+ 2012-01-18 Thomas Adam <thomas@fvwm.org>
+ * fvwm-config.in:
+ * fvwm-config.1.in:
+--- bin/Makefile.am
++++ bin/Makefile.am 2012-07-28 20:17:56.000000000 +0000
+@@ -24,6 +24,9 @@ LDADD = -L$(top_builddir)/libs $(X_LIBS)
+ INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS) $(png_CFLAGS) \
+ $(rsvg_CFLAGS)
+
++configdir = @FVWM_DATADIR@
++config_DATA = \
++fvwm-menu-desktop-config.fpl
+
+ ## The long generation for *.1 is to make both pod2man and 'make -j' happy.
+
+--- bin/Makefile.in
++++ bin/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,7 +16,25 @@
+ @SET_MAKE@
+
+
++
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -62,7 +80,7 @@ CONFIG_CLEAN_FILES = fvwm-bug.1 fvwm-con
+ fvwm-convert-2.4 fvwm-convert-2.6
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(man1dir)"
++ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ fvwm_root_SOURCES = fvwm-root.c
+ fvwm_root_OBJECTS = fvwm-root.$(OBJEXT)
+@@ -89,6 +107,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -100,9 +124,15 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = fvwm-root.c
+ DIST_SOURCES = fvwm-root.c
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
++DATA = $(config_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -219,6 +249,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -293,11 +328,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -358,6 +397,10 @@ LDADD = -L$(top_builddir)/libs $(X_LIBS)
+ INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS) $(png_CFLAGS) \
+ $(rsvg_CFLAGS)
+
++configdir = @FVWM_DATADIR@
++config_DATA = \
++fvwm-menu-desktop-config.fpl
++
+ CLEANFILES = $(bin_SCRIPTS) $(bin_PROGRAMS)
+ all: all-am
+
+@@ -427,8 +470,11 @@ fvwm-convert-2.6: $(top_builddir)/config
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -462,13 +508,16 @@ uninstall-binPROGRAMS:
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-fvwm-root$(EXEEXT): $(fvwm_root_OBJECTS) $(fvwm_root_DEPENDENCIES)
++fvwm-root$(EXEEXT): $(fvwm_root_OBJECTS) $(fvwm_root_DEPENDENCIES) $(EXTRA_fvwm_root_DEPENDENCIES)
+ @rm -f fvwm-root$(EXEEXT)
+ $(LINK) $(fvwm_root_OBJECTS) $(fvwm_root_LDADD) $(LIBS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -496,9 +545,7 @@ uninstall-binSCRIPTS:
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(bindir)" && rm -f $$files
++ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -523,11 +570,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -556,9 +610,28 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
++install-configDATA: $(config_DATA)
++ @$(NORMAL_INSTALL)
++ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(configdir)" || exit $$?; \
++ done
++
++uninstall-configDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -657,9 +730,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
++all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -672,10 +745,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+@@ -710,7 +788,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-data-local install-man
++install-data-am: install-configDATA install-data-local install-man
+
+ install-dvi: install-dvi-am
+
+@@ -756,7 +834,8 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man
++uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
++ uninstall-configDATA uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -766,16 +845,17 @@ uninstall-man: uninstall-man1
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+- install-binSCRIPTS install-data install-data-am \
+- install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-exec-local install-html \
++ install-binSCRIPTS install-configDATA install-data \
++ install-data-am install-data-local install-dvi install-dvi-am \
++ install-exec install-exec-am install-exec-local install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
+- uninstall-binSCRIPTS uninstall-man uninstall-man1
++ uninstall-binSCRIPTS uninstall-configDATA uninstall-man \
++ uninstall-man1
+
+
+ _fvwm-menu-xlock.1: fvwm-menu-xlock
+--- bin/fvwm-menu-desktop.1
++++ bin/fvwm-menu-desktop.1 2012-10-11 18:46:35.000000000 +0000
+@@ -14,461 +14,290 @@
+ .if t .sp .5
+ ..
+ .ta .3i .6i .9i 1.2i 1.5i 1.8i
+-.TH fvwm-menu-desktop 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
++.TH fvwm-menu-desktop 1 "20 April 2012 (2.6.5)" Fvwm "Fvwm Modules"
+ .UC
+ .SH NAME
+-fvwm-menu-desktop \- builds GNOME and KDE menus and style commands for fvwm
++fvwm-menu-desktop \- Reads XDG menu files and creates Fvwm menus
+
+ .SH SYNOPSIS
+-
+ fvwm-menu-desktop
+-[ \fB\-\-help\fR|\fB\-h\fR|\fB\-?\fR ]
+-[ \fB\-\-version\fR|\fB\-v\fR|\fB\-V\fR ]
++[ \fB\-\-help\fR|\fB\-h\fR ]
++[ \fB\-\-version\fR|\fB\-v\fR ]
+ [ \fB\-\-install\-prefix\fR \fIDIR\fR ]
+ [ \fB\-\-desktop\fR \fINAME\fR ]
+-[ \fB\-\-type\fR NAME\fR ]
+-[ \fB\-\-fvwmgtk\-alias\fR \fINAME\fR ]
+-[ \fB\-\-title\fR \fINAME\fR ]
+-[ \fB\-\-name\fR \fINAME\fR ]
+-[ \fB\-\-merge-user-menu\fR ]
++[ \fB\-\-menu\-type\fR \fINAME\fR ]
++[ \fB\-\-theme\fR \fINAME\fR ]
++[ \fB\-\-with\-titles\fR|\fB\-w\fR ]
+ [ \fB\-\-enable\-mini\-icons\fR ]
+-[ \fB\-\-enable\-tran\-mini\-icons\fR ]
+-[ \fB\-\-mini\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-png\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-tran\-mini\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-check-mini\-icons\fR \fIPATH\fR ]
+-[ \fB\-\-icon\-toptitle\fR
+-\fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIside_pic\fR:\fIcolor\fR ]
+-[ \fB\-\-icon\-title\fR
+-\fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIside_pic\fR:\fIcolor\fR ]
+-[ \fB\-\-icon\-folder\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR ]
+-[ \fB\-\-icon\-app\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR ]
+-[ \fB\-\-wm\-icons\fR ]
+-[ \fB\-\-enable\-style\fR ]
+-[ \fB\-\-enable\-tran\-style\fR ]
+-[ \fB\-\-icon-style\fR \fImicon\fR:\fIicon\fR:\fIlaw\fR ]
+-[ \fB\-\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-tran\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-check-icons\fR \fIPATH\fR ]
+-[ \fB\-\-submenu\-name\-prefix\fR \fIname\fR ]
+-[ \fB\-\-dir\fR \fIDIR\fR ]
+-[ \fB\-\-destroy\-type\fR \fIFLAG\fR ]
+-[ \fB\-\-xterm\fR \fICMD\fR ]
+-[ \fB\-\-lang\fR \fINAME\fR ]
+-[ \fB\-\-utf8\fR ]
+-[ \fB\-\-uniconv\fR \fIcharset\fR ]
+-[ \fB\-\-uniconv-exec\fR \fIexec\fR ]
+-[ \fB\-\-menu-style\fR \fIname\fR ]
+-[ \fB\-\-no\-check\-app\fR ]
+-[ \fB\-\-time\-limit\fR \fINUM\fR ]
+-[ \fB\-\-kde_config\fR \fIcommand\fR ]
++[ \fB\-\-size\fR|\fB\-s\fR \fINUM\fR ]
++[ \fB\-\-mini\-icon\-dir\fR|\fB\-t\fR \fIDIR\fR ]
++[ \fB\-\-title\fR|\fB\-t\fR \fINAME\fR ]
++[ \fB\-\-insert\-in\-menu\fR \fINAME\fR ]
++[ \fB\-\-get\-menus\fR \fIall\fR|\fIdesktop\fR ]
++[ \fB\-\-set\-menus\fR \fImenu_paths\fR ]
++[ \fB\-\-verbose\fR ]
++
+
+ .SH DESCRIPTION
+-This is a perl script which parses XDG (GNOME or KDE) menus definitions to build
+-corresponding fvwm menus. The script can also
+-build icon and mini\-icon style commands for the applications.
++This is a python script which parses XDG menus definitions to build
++corresponding fvwm menus.
++
++.SH OPTIONS
++
++.IP "Main Options"
++
++.IP "\fB\-\-help\fR"
++Show the help and exit.
++
++.IP "\fB\-\-version\fR"
++Show the version and exit.
++
++.IP "\fB\-\-install-prefix\fR \fIDIR\fR"
++Optional parameter to override the standard locations for XDG menu
++definitions. The standard locations are
++/etc/xdg/menus (and $HOME/.config/menus if it exists).
++
++.IP "\fB\-\-desktop\fR \fINAME\fR"
++Optional parameter to override the \fINAME\fR of the main desktop
++environment installed on the system. If a system offers multiple
++desktop environments $XDG_MENU_PREFIX is typically set and is
++ignored if \-\-desktop is denoted. Possible names are: \fIgnome\fR,
++\fIkde\fR, \fIxfce\fR, \fIlxde\fR, \fIdebian\fR, etc.
++
++.IP "\fB\-\-menu\-type\fR \fINAME\fR"
++Defines which type of menus should be found. Possible \fINAME\fR types
++could be: \fIapplications\fR, \fIsettings\fR, \fIpreferences\fR, etc.
++
++Note that if the specified menu type doesn't exist the generated menu
++is empty!
++
++.IP "\fB\-\-theme\fR \fINAME\fR"
++Defines the used icon theme. Default is \fIgnome\fR but all others
++found in /usr/share/icons could be used except the \fIhicolor\fR theme
++because it's the default fallback theme if no icon is found.
++
++.IP "\fB\-\-with\-titles\fR|\fB\-w\fR"
++If this option is set menus are generated with titles. Default is no
++titles.
++
++.IP "\fB\-\-title\fR|\fB\-t\fR \fINAME\fR "
++Option to define the menu title \fINAME\fR of the top menu used by Fvwm's
++\fBPopup\fR command. Default is "FvwmMenu".
++
++.IP "\fB\-\-insert\-in\-menu\fR \fINAME\fR"
++Option to insert generated menu(s) \fBIN\fR a menu \fINAME\fR (its
++top title).
++
++Note that this option does not work correctly with the
++Regnerate Menus menu entry in a normal built menu since items inserted
++into such a menu cannot be removed (currently). If you use this option
++there and want to update your menus, you have to restart fvwm. A better
++way is to use dynamic menus (see the example in the USAGE section).
++
++.IP "\fB\-\-get\-menus\fR \fIall\fR|\fIdesktop\fR"
++Prints a space separated list of full menu paths. \fIall\fR is all menus
++on the system except empty ones. \fIdesktop\fR is desktop related menus.
++No menu generation is done.
++
++This option is meant for use with the configuration tool.
++
++.IP "\fB\-\-set\-menus\fR \fImenu_paths\fR"
++Expects a space separated list of full menu paths to generate user
++specified menus
++
++This option is meant for use with the configuration tool.
++
++.IP "\fB\-\-verbose\fR"
++Enables additional information printouts on STDERR.
++
++.IP "Icons Options"
++
++By default, fvwm-menu-desktop builds menus without mini\-icons. To enable
++mini\-icons use:
++
++.IP "\fB\-\-enable\-mini\-icons\fR"
++This option enables mini\-icons in the menus. If set, 24x24 mini-icons
++are used. If the specified icon isn't that size it will be converted
++if \fBImageMagick\fR is installed and saved in $HOME/.fvwm/icons or to
++the directory specified with \-\-mini\-icon\-dir option. Otherwise no icon
++appears in the menu for that entry.
++With most distributions, all the menu entries will have mini-icons
++appropriate to the application.
++
++.IP "\fB\-\-size\fR|\fB\-s\fR \fINUM\fR"
++If \-\-enable\-mini\-icons is used the \fIsize\fR of the icons can
++changed with this parameter. Default is 24.
++
++.IP "\fB\-\-mini\-icon\-dir\fR \fIDIR\fR"
++When the right size mini-icon isn't available,
++fvwm-menu-desktop creates icons with the right size in $HOME/.fvwm/icons.
++If you don't want to use the default directory, $HOME/.fvwm/icons,
++use this option to specify a different folder.
+
+ .SH USAGE
+-There are a lot of options. However the defaults are, I hope, good
+-enough.
+-If you want the application menu in the menu "Utilities" add the
+-following lines in your .fvwm2rc file:
++Without any parameters \fBfvwm-menu-desktop\fR creates a menu named
++"FvwmMenu" with sub menus found for the main desktop environment
++installed on the system.
++
++To add the default generated menu to the "Root" menu add the following
++to your fvwm config file (~/.fvwm/config or ~/.fvwm/.fvwm2rc). This
++generates the menu each time you pop it up:
++
++.RS
+ .EX
+- ...
+-AddToMenu Utilities "Application Menu" Popup FvwmMenu
+- ...
++AddToMenu MenuRoot "XDG Menus" Popup FvwmMenu
+ PipeRead 'fvwm-menu-desktop'
+ .EE
+-If the KDE mini\-icons are in "mini/"
+-relative to your fvwm ImagePath add the option \-\-enable-mini\-icons.
+-(if the KDE mini\-icons are in some other place
+-use the \-\-mini\-icons\-path option, e.g., they are in your
+-ImagePath plus \-\-mini\-icons\-path). If you want to build Icon and
+-MiniIcon style commands for KDE applications, add the option \-\-enable-style.
+-If you want to have the KDE user menu replace "sys" by "user". If you use
+-the KDE menu editor, you may want to pop this menu up dynamically.
+-Then, put this into your .fvwm2rc file (note the destroy-type).
++.RE
++
++This is likely to be too slow and is not recommended.
++
++Another possibility is to use \fBDynamicPopupAction\fR,
++the menu will be built only if you pop up the menu. The following
++creates a "KDE Menus" menu which contains all Kde menus found on the
++system which is built only the first time you pop it up:
++
++.RS
+ .EX
+-AddToMenu Utilities "KDE User Menu" Popup kde\-user
++AddToMenu MenuRoot "KDE Menus" Popup FvwmKde
+ ...
+-AddToMenu kde\-user
+-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop --desktop kde-user --enable-mini-icons [--destroy-type dynamic] [other options]'
++
++AddToMenu FvwmKde
+++ DynamicPopupAction PipeRead 'fvwm-menu-desktop --desktop kde \\
++ --title FvwmKde \\
++ --enable-mini-icons \\
++ [other options]'
+ .EE
++.RE
+
+-The following example builds "all" GNOME menus (with some
+-mini\-icons in the system menu). You need to specify the
+-GNOME installation prefix if it is not /usr (with the
+-option \-\-install\-prefix). Moreover, the GNOME icons need to be in your
+-ImagePath and the non .png mini\-icons you use for the user\-menu
+-need to be in mini/ (if not, use the \-\-png\-icons\-path option and
+-the \-\-mini\-icons\-path option, respectively).
++The example above generates a menu with the Xdg menus as sub menus. If
++the sub menus should appear one level higher do this:
+
++.RS
+ .EX
+-Module FvwmGtk
+-*FvwmGtk: Destroy gnome-all
+-*FvwmGtk: Menu gnome-all
+-*FvwmGtk: Title "Gnome Menus"
+-*FvwmGtk: Separator
+-*FvwmGtk: Destroy gnome-sys
+-*FvwmGtk: Submenu "System" gnome-sys
+-*FvwmGtk: Destroy gnome-user
+-*FvwmGtk: Submenu "User" gnome-user
+-*FvwmGtk: Destroy gnome-redhat
+-*FvwmGtk: Submenu "RedHat" gnome-redhat
++AddToMenu MenuRoot "Root Menu" Title
+++ PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot'
++.EE
++.RE
++
++To generate single menus like \fIpreferences\fR:
+
+-PipeRead 'fvwm-menu-desktop --type gtk --enable-mini-icons --icon-folder :re --icon-app :re --icon-title :re --icon-toptitle :re'
++.RS
++.EX
++fvwm-menu-desktop --desktop kde --menu-type preferences --title FvwmPref \\
++ --enable-mini-icons -size 16 --with-titles
++.EE
++.RE
+
+-PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-user --enable-mini-icons'
++This generates a single KDE Preferences menu with top title
++"FvwmPref", mini icons with a size of 16x16 pixels and titles for each
++sub menu. But only if a menu with the name \fIpreferences\fR
++exists in the users or system wide Xdg directories. Else it's empty!
+
+-PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-redhat --enable-mini-icons'
++To add the generated menu to the "Utilities" menu for example put the
++following to your fvwm config file (~/.fvwm/config or ~/.fvwm/.fvwm2rc):
+
+-# To obtain the menu above with Alt-button1 on the root window
+-Mouse 1 R M SendToModule FvwmGtk gnome-all
++.RS
++.EX
++AddToMenu Utilities "Preferences Menu" Popup FvwmPref
++PipeRead 'fvwm-menu-desktop --desktop kde --menu-type preferences \\
++ --title FvwmPref [other options]'
+ .EE
++.RE
++
++If you think that \fBfvwm-menu-desktop\fR slows down your menu startup too
++much do not use \fBPipeRead\fR. Instead run \fBfvwm-menu-desktop\fR and
++redirect the menu to a file and read that file in your .fvwm2rc file.
+
+-You can specify FvwmGtk alias: Module FvwmGtk MyGnomeMenu.
+-In this case you must pass an additional parameter to fvwm-menu-desktop:
+-\-\-fvwmgtk-alias MyGnomeMenu.
+-
+-Of course you can build fvwm (i.e., no FvwmGtk) GNOME menus.
+-GNOME and KDE2 use PNG icons which are not supported by fvwm menu.
+-However, if you have XPM version of the GNOME or of the KDE2 (mini-)icons
+-you can build fvwm menus and style commands with these icons using the
+-option \-\-enable-tran-mini\-icons and \-\-enable\-tran\-style. The
+-Fvwm Themes package (http://fvwm-themes.sourceforge.net/) contains
+-an utility, fvwm-themes-images, which can convert automatically
+-(with the help of ImageMagick) all GNOME and KDE2 icons to XPM
+-icons.
+-
+-You can build sub menus using the \-\-dir options. However,
+-if you want to use more than one submenu
+-it is better to build the "all" menu and to use the submenu names.
+-See the option \-\-submenu\-name\-prefix for information on submenu
+-names. Nevertheless, you may put the menu in a tmp file using
+-redirection to see the submenu names.
+-
+-If you think that fvwm-menu-desktop slows your startup too much do
+-not use PipeRead. Instead run fvwm-menu-desktop
+-and
+-redirect the menu to a file and Read that file in
+-your .fvwm2rc file.
+-Another possibility is to use DynamicPopupAction
+-(with fvwm menu), the menu (and the styles) will be built only if
+-you pop up the menu. The
+-following menu creates a "kde\-all" menu which contains the user menu
+-which is built each time you pop up "kde\-all" and contains a pop up
+-to the system menu which is built only the first time you pop it up.
++.RS
+ .EX
+-AddToMenu kde\-all
+-+ DynamicPopupAction FuncRecreateKdeAll
++AddToMenu MenuRoot "XDG Menus" Popup FvwmMenu
++ ...
+
+-AddToMenu kde\-sys
+-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop \\
+-\-\-desktop kde\-sys [options, but \-\-destroy-type d* or n*]'
+-
+-AddToFunc FuncRecreateKdeAll \\
+-I PipeRead 'fvwm-menu-desktop \\
+-\-\-desktop kde\-user \-\-enable\-mini\-icons \-\-name kde\-all \\
+-\-\-destroy-type dynamic [options you like]'
+-+ I AddToMenu "kde\-all" "" Nop
+-+ I AddToMenu "kde\-all" "Kde System%mini/mini\-k.xpm%" Popup kde\-sys
++AddToMenu FvwmMenu
+++ DynamicPopupAction Function FuncRecreateXdgMenus
++ ...
++
++DestroyFunc FuncRecreateXdgMenus
++AddToFunc FuncRecreateXdgMenus
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
+ .EE
++.RE
+
+-fvwm-menu-desktop takes into account your $LANG environment variable,
+-which may be overwritten using the --lang option.
++or if you want to show the menus directly in a normal "Root" menu use
++this:
+
+-Hint, if you need a different menu font or item format from the ones used
+-in the default MenuStyle, you may use the --menus-style option to assign
+-a non-default MenuStyle name to menus built by this script.
+-Don't forget to create a new menu style in your .fvwm2rc, using CopyMenuStyle
+-and MenuStyle commands.
++.RS
++.EX
++AddToMenu MenuRoot "Root Menu" Title
+++ FuncXdgMenusInRoot
++ ...
+
+-.SH OPTIONS
++DestroyFunc FuncXdgMenusInRoot
++AddToFunc FuncXdgMenusInRoot
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot \\
++ > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
++.EE
++.RE
+
+-.IP "Main Options"
++The problem here is, that you have to restart fvwm because items insserted
++into such a menu cannot be removed. For that BOTH menus must be regenerated:
+
+-.IP "\fB\-\-help\fR"
+-Show the help and exit.
+-.IP "\fB\-\-version\fR"
+-Show the version and exit.
+-.IP "\fB\-\-install-prefix\fR \fIDIR\fR"
+-The prefix of GNOME or KDE installation. Default
+-is /usr for GNOME (other common prefixes: /usr/local, /opt/gnome).
+-For KDE the default is $KDEDIR and you probably do not need
+-to use this option.
+-.IP "\fB\-\-desktop\fR \fINAME\fR"
+-Use gnome\-sys for the GNOME system menu (this is the default),
+-gnome\-user for
+-the GNOME user menu, gnome\-redhat for the AnotherLevel
+-menu of Red Hat,
+-gnome\-mandriva for Mandriva menudrake menus,
+-kde\-sys for the KDE system menu and kde\-user for
+-the KDE user menu. It may be useful to use KDE or GNOME as a flag with
+-the \-\-dir option.
+-.IP "\fB\-\-type\fR \fINAME\fR"
+-If NAME is fvwm, a native fvwm menu will be built (this is
+-the default). If NAME is gtk, a FvwmGtk menu will be built.
+-.IP "\fB\-\-fvwmgtk-alias\fR \fINAME\fR"
+-The name for then FvwmGtk module to use instead of default FvwmGtk.
+-.IP "\fB\-\-title\fR \fINAME\fR"
+-Define the menu title of the top menu. Default
+-is "Gnome System Menu" for gnome\-sys, "Gnome User Menu" for
+-gnome\-user, "Gnome Red Hat Menu" for gnome\-redhat,
+-"Gnome Mandriva Menu" for gnome\-mandriva. For KDE the
+-default is given by KDE itself (or are similar to GNOME title).
+-.IP "\fB\-\-name\fR \fINAME\fR"
+-Define the menu name of the top menu. Default is the \-\-desktop
+-name if you use one above.
+-.IP "\fB\-\-merge-user-menu\fR"
+-this option tries to merge the user menu
+-with the system menu (gnome-sys or kde-sys, based on the --desktop option)
+-and takes into account changes to the system menu that it is now
+-possible to do in the "user directory" (at least with KDE version 2
+-menu editor).
++.RS
++.EX
++AddToMenu MenuRoot DynamicPopupAction FuncMenuRoot
++
++DestroyFunc FuncMenuRoot
++AddToFunc FuncMenuRoot
+++ I DestroyMenu MenuRoot
+++ I AddToMenu MenuRoot DynamicPopupAction FuncMenuRoot
+++ I AddToMenu MenuRoot "Root Menu" Title
+++ I Popup XdgMenus
++
++AddToMenu XdgMenus DynamicPopupAction FuncXdgMenusInRoot
++
++DestroyFunc FuncXdgMenusInRoot
++AddToFunc FuncXdgMenusInRoot
+++ I AddToMenu XdgMenus DynamicPopupAction FuncXdgMenusInRoot
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot \\
++ > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
++.EE
++.RE
+
+
+-.IP "Icons Options"
++.SH GUI
++There's a \fBFvwmForm\fR GUI to setup the menu generation manually. It
++is found in the root of the generated menu called "Regenerate XDG Menu(s)".
+
+-By default, fvwm-menu-desktop builds mini\-icon free menus. To enable
+-mini\-icons use one of the two following options.
++Or it can be started from within \fBFvwmConsole\fR with
+
+-.IP "\fB\-\-enable\-mini\-icons\fR"
+-This option enables mini\-icons in the menu.
+-The desktop hints are used if it is possible
+-(fvwm menu can't use .png icons). Use
+-the \-\-mini\-icons\-path and the \-\-png\-icons\-path to specify
+-the good paths. By using the \-\-icon-* options below you
+-can control mini\-icons in menus.
+-.IP "\fB\-\-enable\-tran\-mini\-icons\fR"
+-This option applies only to fvwm menus and is useful to build GNOME or KDE2
+-menus with mini\-icons (and if you have XPM version of the GNOME or KDE2
+-PNG icons).
+-If this option is used any
+-icon hint foo.png is translated to path/foo.xpm
+-where path is determined by the \-\-tran\-mini\-icons\-path option
+-(xpm icons are used as with the previous option).
+-.IP "\fB\-\-mini\-icons\-path\fR \fIDIR\fR"
+-Define the directory of the .xpm mini\-icons (relative to your
+-ImagePath). Default is "mini/".
+-.IP "\fB\-\-png\-icons\-path\fR \fIDIR\fR"
+-Define the directory of .png icons. Default is "" (i.e., in your
+-ImagePath). Useful only with FvwmGtk menus.
+-.IP "\fB\-\-tran\-mini\-icons\-path\fR \fIDIR\fR"
+-Define the directory of the mini\-icons for the \-\-enable\-tran\-mini\-icons
+-option. Default is mini/. It is
+-preferable to give the complete path so that fvwm-menu-desktop can check
+-if the translated mini\-icons exists (and the "re" law will apply in
+-a good way).
+-.IP "\fB\-\-check\-mini\-icons\fR \fIPATH\fR"
+-Where PATH is a list of directories with ":" as a separator. Then,
+-fvwm-menu-desktop checks that the mini icons actually exist in one of
+-these directories (this check is not done for the translated mini icons).
+-
+-.IP Comments
+-
+-To control mini\-icons in menus you can use the 4 following options
+-which work similarly.
+-
+-In these options \fIlaw\fR may be \fIno\fR, \fIdh\fR, \fIre\fR or \fIow\fR.
+-\fIno\fR means "do not use mini\-icon" (this does not affect side pic).
+-\fIdh\fR means "use only the mini\-icons GNOME/KDE hints".
+-\fIre\fR means "use mini\-icons GNOME/KDE hints but if it is empty
+-use the specified mini\-icon".
+-\fIow\fR means "override the mini\-icons GNOME/KDE hints by the specified
+-mini\-icon".
+-
+-The path to the specified icons is given by the
+-options \-\-mini\-icons\-path, \-\-png\-icons\-path
+-or \-\-tran\-mini\-icons\-path (i.e., you just have to
+-specify the icon, the path is computed). For the sidepic you need to
+-give the complete relative path from your ImagePath.
+-
+-Note that for the fvwm menu (without the \-\-enable\-tran\-mini\-icons option)
+-a .png icon hint is
+-considered as an empty hint, so for the system menu use no=dh and re=ow
+-(you may use .xpm icons in a user menu). If
+-the \-\-tran\-mini\-icons\-path option is set with a complete path,
+-then if the .xpm icon which corresponds to a .png icon hint
+-does not exist, the icon hint is considered as empty.
+-
+-
+-\fIplace\fR, \fIsidepic\fR and \fIcolor\fR
+-apply only with fvwm menus. \fIplace\fR is either left or up.
+-\fIleft\fR means that the icon will be placed on the left of the
+-label. \fIup\fR means that the icon will be placed above the label.
+-\fIsidepic\fR needs to be nothing or an icon (for a picture in the
+-bottom left of the menu). \fIcolor\fR applies only
+-if a sidepic icon is given and it is the color for the region of the menu
+-containing the sidepic picture.
+-
+-When you use an option below, if an icon, a law ...etc is not
+-specified (i.e., empty) the default is used (e.g, if you want,
+-for an fvwm menu, the icon folder.xpm on the left of the top title
+-and the sidepic fvwm2.xpm on the left of this menu
+-use the following: \-\-icon\-toptitle :ow::fvwm2.xpm).
+-
+-.IP "\fB\-\-icon-toptitle\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Mini\-icon for the top title and sidepic for the top menu.
+-Default for fvwm menus: folder.xpm:no:left::.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons:
+-gnome\-logo\-icon\-transparent.xpm:no:left:.
+-Default for gtk menus:
+-gnome\-logo\-icon\-transparent.png:no.
+-.IP "\fB\-\-icon\-title\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Use the option below for submenus.
+-Default for fvwm menus: folder.xpm:dh:left::.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons:
+-gnome\-folder.xpm:dh:left::.
+-Default for gtk menus: gnome\-folder.png:dh
+-.IP "\fB\-\-icon\-folder\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Mini-icons for pop up item.
+-Default for fvwm menus: folder.xpm:dh:left.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons: gnome\-folder.xpm:dh:left.
+-Default for gtk menus: gnome\-folder.png:dh.
+-.IP "\fB\-\-icon\-app\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR"
+-Mini\-icon for applications item.
+-Default for fvwm menus: mini\-x.xpm:dh.
+-Default for fvwm menus
+-with \-\-enable\-tran\-mini\-icons: gnome\-default.xpm:dh.
+-Default for gtk menus: gnome\-default.png:dh
+-
+-.IP \fB--wm-icons\fR
+-This is a shortcut, which can be used if you plan to use icons from the
+-wm-icons package. Currently this is equivalent to:
+-\-\-enable\-mini\-icons
+-\-\-mini\-icons\-path ''
+-\-\-icon\-toptitle menu/folder-open.xpm:ow
+-\-\-icon\-title menu/folder-open.xpm:ow
+-\-\-icon\-folder menu/folder.xpm:ow
+-\-\-icon\-app menu/utility.xpm:ow.
+-
+-.IP "Style Options"
+-
+-.IP "\fB\-\-enable-style\fR \fImini\-icon\fR:\fIicon\fR:\fIlaw\fR:\fIaddstyle\fR"
+-Build icons and mini\-icons style commands for the applications in the built
+-menu.
+-.IP "\fB\-\-style\-tran\fR"
+-Only useful with FvwmGtk GNOME or KDE2 menus. Make translation as the
+-enable\-tran\-mini\-icon option but only for style
+-(not for mini\-icons menus).
+-.IP "\fB\-\-icon-style\fR \fImini\-icon\fR:\fIicon\fR:\fIlaw\fR:\fIaddstyle\fR"
+-This option
+-is similar to the options \-\-icon-* above. Default law is "dh"
+-(there is no "no" law).
+-Default mini\-icon is mini\-x.xpm and default icon
+-is x.xpm. You can add a style to all applications with
+-addstyle. If you use the enable\-tran\-mini\-icon options the translated
+-(mini\-)icons will be used (if translation is needed)
+-and the default icons are gnome\-default.xpm.
+-If you use the \-\-enable\-tran\-style options above the default icons
+-are gnome\-default.xpm.
+-The paths to mini\-icons are the same as those for the menus. The
+-path to the icons is computed from the mini\-icons path: they are one
+-directory up to the corresponding mini\-icons path (so the "defaults"
+-are "" and this is consistent with KDE1 and XPM icons builded by
+-fvwm-themes-images).
+-.IP "\fB\-\-icons\-path\fR \fIDIR\fR"
+-Not useful in a normal situation.
+-Define the directory of the icons. Default is one directory up from
+-the path given by the \-\-mini\-icons\-path option. To set the path to ""
+-you need to use "inpath".
+-.IP "\fB\-\-tran\-icons\-path\fR \fIDIR\fR"
+-Similar to the above option.
+-.IP "\fB\-\-check\-icons\fR \fIPATH\fR"
+-Where PATH is a list of directories with ":" as a separator. Then,
+-fvwm-menu-desktop checks that the icons actually exist in one of
+-these directories (this chack is not done for the translated icons, use a
+-full path in --tran-icons-path to do so).
+-
+-.IP "Other Options"
+-
+-.IP "\fB\-\-submenu\-name\-prefix\fR \fINAME\fR"
+-May be useful in some unfortunate cases. By default the name of a sub menu
+-is of the form prefix\-adirname\-level where prefix is the desktop
+-flag, adirname is the name of the directory of the description of the
+-sub menus (not a complete path) and where level is an integer equal to
+-the number of "cd"s you need to do to go from the root to the directory of the
+-description of the sub menus. You may change the prefix using the
+-present option.
+-.IP "\fB\-\-dir\fR \fIDIR\fR"
+-Set the directory where fvwm-menu-desktop
+-looks for a GNOME/KDE menu description to \fIDIR\fR.
+-The name of the menu is 'desktop\-name' and the title is 'desktop' name
+-where 'desktop' is either GNOME or
+-KDE (if fvwm-menu-desktop can't find which desktop is concerned, you can
+-help with the \-\-desktop option) and where 'name' is the name of the
+-right directory of \fIDIR\fR (or a hint of the desktop for the title).
+-Note that if this option is not set, the description directory is
+-install\-prefix/share/gnome/apps if \-\-desktop is gnome\-sys,
+-$HOME/.gnome/apps if \-\-desktop is gnome\-user,
+-$HOME/.gnome/apps\-redhat if \-\-desktop is gnome\-redhat,
+-$HOME/.gnome/apps\-mdk if \-\-desktop is gnome\-mandriva,
+-$KDEDIR/share/applink if \-\-desktop is kde\-sys and
+-$HOME/.kde/share/applnk if\-\-desktop is sys\-user.
+-.IP "\fB\-\-destroy\-type\fR \fIflag\fR"
+-flag may be "y(es)", "no", "d(ynamic)". Default is "yes" with fvwm menus,
+-"no" with FvwmGtk menus and dynamic applies only with fvwm menus.
+-If "yes" is used the top menu will be destroyed (DestroyMenu "name"),
+-if "no" is used the top menu will not be destroyed (useful for FvwmGtk
+-menus called by another menu via FvwmGtkSubMenu or to give the same
+-name to two or more menus built by fvwm-menu-desktop). If dynamic
+-is used the menu will be destroyed/recreated (may be useful with
+-DynamicPopupAction). Note that all the built sub menus are always
+-destroyed.
+-.IP "\fB\-\-xterm\fR \fICMD\fR"
+-Define complete X terminal command to run applications in it if needed.
+-Default is 'xterm -e'.
+-.IP "\fB\-\-lang\fR \fINAME\fR"
+-Default is the value of $LANG. Useful if your language is not GNOME/KDE
+-compliant and you prefer a non-English compliant
+-language. Also useful if fvwm-menu-desktop gives bad result with your language.
+-.IP "\fB\-\-utf8\fR"
+-Assume that the desktop entries used UTF-8 encoding. This is the case
+-with KDE version 2 and will be probably the case with GNOME version 2.
+-At the present time this option work only if you have perl version 5.6
+-or better and if your language use latin-1 font. If one of these conditions
+-is not satisfied, then this option is equivalent to \-\-lang en. For other
+-languages/charsets use the \-\-uniconv option. The advantage of this option
+-as compared to the following option is that it is fast.
+-.IP "\fB\-\-uniconv\fR \fIcharset\fR"
+-Use iconv, uniconv or internal method to translate utf8 desktop entries
+-into an appropriate "charset". You can choose between one of the supported
+-tools using \-\-uniconv-exec option. iconv comes with glibc >= 2.1.1 and
+-uniconv comes with the utf8 editor yudit. Type "iconv --list" or "man
+-uniconv" for the list of supported charsets. Of course you must also use the
+-appropriate font using the MenuStyle command. Also, $LANG (or --lang xx)
+-must be compatible with the charset. Note, if you don't use an internal
+-method, fvwm-menu-desktop is very slow with this option: you probably need
+-to use the --time-limit option and you should redirect the result into a
+-file and read this file in your fvwm configuration.
+-.IP "\fB\-\-uniconv-exec\fR \fIexec\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-menu-style\fR \fIname\fR"
+-By default the generated fvwm menus use the default MenuStyle (i.e., the
+-MenuStyle "*"). You can specify another MenuStyle name using this option.
+-.IP "\fB\-\-[no]check-app\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-time-limit\fR \fINUM\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-kde_config\fR \fIcommand\fR"
+-If available, this script uses the command kde-config or kde4-config
+-to find the XDG menus. If the kde-config command has another name
+-you can use this option to set the command name.
+-If this script can't find any kde-config command, it does it's best to run
+-without it.
++.RS
++.EX
++Module FvwmPerl -l fvwm-menu-desktop-config.fpl
++.EE
++.RE
+
+ .SH BUGS
+-This script needs more testing to see if all options work well
+-(note that the script does not check for inconsistency of the given options).
+-If Desktop menu hints are changed the script may not work as
+-expected. I have tested the script with gnome-core-1.0.3, kde-1.1, kde-1.2
+-and kde-2.0.
++The whole process of creating menus from files is slow.
++Otherwise report bugs to the
++fvwm-workers mailing list <fvwm-workers@fvwm.org>.
++
+
+ .SH AUTHORS
+-Olivier Chapuis <olivier.chapuis@free.fr>
++This script is based on fvwm-xdg-menu.py written by Piotr Zielinski
++(http://www.cl.cam.ac.uk/~pz215/) who assigned Licence: GPL 2 Date:
++03.12.2005.
++
++The script was reworked to replace the existing fvwm-menu-desktop perl
++script by the fvwm-workers.
+
+-Mikhael Goikhman <migo@homemail.com> - some changes
+
+ .SH COPYING
+-The script is distributed by the same terms as fvwm itself.
+-See GNU General Public License for details.
++The script is distributed by the same terms as fvwm itself. See GNU
++General Public License for details.
+--- bin/fvwm-menu-desktop.1.in
++++ bin/fvwm-menu-desktop.1.in 2012-09-03 04:01:35.000000000 +0000
+@@ -17,458 +17,287 @@
+ .TH fvwm-menu-desktop 1 "@RELDATELONG@ (@VERSION@)" Fvwm "Fvwm Modules"
+ .UC
+ .SH NAME
+-fvwm-menu-desktop \- builds GNOME and KDE menus and style commands for fvwm
++fvwm-menu-desktop \- Reads XDG menu files and creates Fvwm menus
+
+ .SH SYNOPSIS
+-
+ fvwm-menu-desktop
+-[ \fB\-\-help\fR|\fB\-h\fR|\fB\-?\fR ]
+-[ \fB\-\-version\fR|\fB\-v\fR|\fB\-V\fR ]
++[ \fB\-\-help\fR|\fB\-h\fR ]
++[ \fB\-\-version\fR|\fB\-v\fR ]
+ [ \fB\-\-install\-prefix\fR \fIDIR\fR ]
+ [ \fB\-\-desktop\fR \fINAME\fR ]
+-[ \fB\-\-type\fR NAME\fR ]
+-[ \fB\-\-fvwmgtk\-alias\fR \fINAME\fR ]
+-[ \fB\-\-title\fR \fINAME\fR ]
+-[ \fB\-\-name\fR \fINAME\fR ]
+-[ \fB\-\-merge-user-menu\fR ]
++[ \fB\-\-menu\-type\fR \fINAME\fR ]
++[ \fB\-\-theme\fR \fINAME\fR ]
++[ \fB\-\-with\-titles\fR|\fB\-w\fR ]
+ [ \fB\-\-enable\-mini\-icons\fR ]
+-[ \fB\-\-enable\-tran\-mini\-icons\fR ]
+-[ \fB\-\-mini\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-png\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-tran\-mini\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-check-mini\-icons\fR \fIPATH\fR ]
+-[ \fB\-\-icon\-toptitle\fR
+-\fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIside_pic\fR:\fIcolor\fR ]
+-[ \fB\-\-icon\-title\fR
+-\fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIside_pic\fR:\fIcolor\fR ]
+-[ \fB\-\-icon\-folder\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR ]
+-[ \fB\-\-icon\-app\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR ]
+-[ \fB\-\-wm\-icons\fR ]
+-[ \fB\-\-enable\-style\fR ]
+-[ \fB\-\-enable\-tran\-style\fR ]
+-[ \fB\-\-icon-style\fR \fImicon\fR:\fIicon\fR:\fIlaw\fR ]
+-[ \fB\-\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-tran\-icons\-path\fR \fIDIR\fR ]
+-[ \fB\-\-check-icons\fR \fIPATH\fR ]
+-[ \fB\-\-submenu\-name\-prefix\fR \fIname\fR ]
+-[ \fB\-\-dir\fR \fIDIR\fR ]
+-[ \fB\-\-destroy\-type\fR \fIFLAG\fR ]
+-[ \fB\-\-xterm\fR \fICMD\fR ]
+-[ \fB\-\-lang\fR \fINAME\fR ]
+-[ \fB\-\-utf8\fR ]
+-[ \fB\-\-uniconv\fR \fIcharset\fR ]
+-[ \fB\-\-uniconv-exec\fR \fIexec\fR ]
+-[ \fB\-\-menu-style\fR \fIname\fR ]
+-[ \fB\-\-no\-check\-app\fR ]
+-[ \fB\-\-time\-limit\fR \fINUM\fR ]
+-[ \fB\-\-kde_config\fR \fIcommand\fR ]
++[ \fB\-\-size\fR|\fB\-s\fR \fINUM\fR ]
++[ \fB\-\-mini\-icon\-dir\fR|\fB\-t\fR \fIDIR\fR ]
++[ \fB\-\-title\fR|\fB\-t\fR \fINAME\fR ]
++[ \fB\-\-insert\-in\-menu\fR \fINAME\fR ]
++[ \fB\-\-get\-menus\fR \fIall\fR|\fIdesktop\fR ]
++[ \fB\-\-set\-menus\fR \fImenu_paths\fR ]
++[ \fB\-\-verbose\fR ]
++
+
+ .SH DESCRIPTION
+-This is a perl script which parses XDG (GNOME or KDE) menus definitions to build
+-corresponding fvwm menus. The script can also
+-build icon and mini\-icon style commands for the applications.
++This is a python script which parses XDG menus definitions to build
++corresponding fvwm menus.
++
++.SH OPTIONS
++
++.IP "Main Options"
++
++.IP "\fB\-\-help\fR"
++Show the help and exit.
++
++.IP "\fB\-\-version\fR"
++Show the version and exit.
++
++.IP "\fB\-\-install-prefix\fR \fIDIR\fR"
++Optional parameter to override the standard locations for XDG menu
++definitions. The standard locations are
++/etc/xdg/menus (and $HOME/.config/menus if it exists).
++
++.IP "\fB\-\-desktop\fR \fINAME\fR"
++Optional parameter to override the \fINAME\fR of the main desktop
++environment installed on the system. If a system offers multiple
++desktop environments $XDG_MENU_PREFIX is typically set and is
++ignored if \-\-desktop is denoted. Possible names are: \fIgnome\fR,
++\fIkde\fR, \fIxfce\fR, \fIlxde\fR, \fIdebian\fR, etc.
++
++.IP "\fB\-\-menu\-type\fR \fINAME\fR"
++Defines which type of menus should be found. Possible \fINAME\fR types
++could be: \fIapplications\fR, \fIsettings\fR, \fIpreferences\fR, etc.
++
++Note that if the specified menu type doesn't exist the generated menu
++is empty!
++
++.IP "\fB\-\-theme\fR \fINAME\fR"
++Defines the used icon theme. Default is \fIgnome\fR but all others
++found in /usr/share/icons could be used except the \fIhicolor\fR theme
++because it's the default fallback theme if no icon is found.
++
++.IP "\fB\-\-with\-titles\fR|\fB\-w\fR"
++If this option is set menus are generated with titles. Default is no
++titles.
++
++.IP "\fB\-\-title\fR|\fB\-t\fR \fINAME\fR "
++Option to define the menu title \fINAME\fR of the top menu used by Fvwm's
++\fBPopup\fR command. Default is "FvwmMenu".
++
++.IP "\fB\-\-insert\-in\-menu\fR \fINAME\fR"
++Option to insert generated menu(s) \fBIN\fR a menu \fINAME\fR (its
++top title).
++
++Note that this option does not work correctly with the
++Regnerate Menus menu entry in a normal built menu since items inserted
++into such a menu cannot be removed (currently). If you use this option
++there and want to update your menus, you have to restart fvwm. A better
++way is to use dynamic menus (see the example in the USAGE section).
++
++.IP "\fB\-\-get\-menus\fR \fIall\fR|\fIdesktop\fR"
++Prints a space separated list of full menu paths. \fIall\fR is all menus
++on the system except empty ones. \fIdesktop\fR is desktop related menus.
++No menu generation is done.
++
++This option is meant for use with the configuration tool.
++
++.IP "\fB\-\-set\-menus\fR \fImenu_paths\fR"
++Expects a space separated list of full menu paths to generate user
++specified menus
++
++This option is meant for use with the configuration tool.
++
++.IP "\fB\-\-verbose\fR"
++Enables additional information printouts on STDERR.
++
++.IP "Icons Options"
++
++By default, fvwm-menu-desktop builds menus without mini\-icons. To enable
++mini\-icons use:
++
++.IP "\fB\-\-enable\-mini\-icons\fR"
++This option enables mini\-icons in the menus. If set, 24x24 mini-icons
++are used. If the specified icon isn't that size it will be converted
++if \fBImageMagick\fR is installed and saved in $HOME/.fvwm/icons or to
++the directory specified with \-\-mini\-icon\-dir option. Otherwise no icon
++appears in the menu for that entry.
++With most distributions, all the menu entries will have mini-icons
++appropriate to the application.
++
++.IP "\fB\-\-size\fR|\fB\-s\fR \fINUM\fR"
++If \-\-enable\-mini\-icons is used the \fIsize\fR of the icons can
++changed with this parameter. Default is 24.
++
++.IP "\fB\-\-mini\-icon\-dir\fR \fIDIR\fR"
++When the right size mini-icon isn't available,
++fvwm-menu-desktop creates icons with the right size in $HOME/.fvwm/icons.
++If you don't want to use the default directory, $HOME/.fvwm/icons,
++use this option to specify a different folder.
+
+ .SH USAGE
+-There are a lot of options. However the defaults are, I hope, good
+-enough.
+-If you want the application menu in the menu "Utilities" add the
+-following lines in your .fvwm2rc file:
++Without any parameters \fBfvwm-menu-desktop\fR creates a menu named
++"FvwmMenu" with sub menus found for the main desktop environment
++installed on the system.
++
++To add the default generated menu to the "Root" menu add the following
++to your fvwm config file (~/.fvwm/config or ~/.fvwm/.fvwm2rc). This
++generates the menu each time you pop it up:
++
++.RS
+ .EX
+- ...
+-AddToMenu Utilities "Application Menu" Popup FvwmMenu
+- ...
++AddToMenu MenuRoot "XDG Menus" Popup FvwmMenu
+ PipeRead 'fvwm-menu-desktop'
+ .EE
+-If the KDE mini\-icons are in "mini/"
+-relative to your fvwm ImagePath add the option \-\-enable-mini\-icons.
+-(if the KDE mini\-icons are in some other place
+-use the \-\-mini\-icons\-path option, e.g., they are in your
+-ImagePath plus \-\-mini\-icons\-path). If you want to build Icon and
+-MiniIcon style commands for KDE applications, add the option \-\-enable-style.
+-If you want to have the KDE user menu replace "sys" by "user". If you use
+-the KDE menu editor, you may want to pop this menu up dynamically.
+-Then, put this into your .fvwm2rc file (note the destroy-type).
++.RE
++
++This is likely to be too slow and is not recommended.
++
++Another possibility is to use \fBDynamicPopupAction\fR,
++the menu will be built only if you pop up the menu. The following
++creates a "KDE Menus" menu which contains all Kde menus found on the
++system which is built only the first time you pop it up:
++
++.RS
+ .EX
+-AddToMenu Utilities "KDE User Menu" Popup kde\-user
++AddToMenu MenuRoot "KDE Menus" Popup FvwmKde
+ ...
+-AddToMenu kde\-user
+-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop --desktop kde-user --enable-mini-icons [--destroy-type dynamic] [other options]'
++
++AddToMenu FvwmKde
+++ DynamicPopupAction PipeRead 'fvwm-menu-desktop --desktop kde \\
++ --title FvwmKde \\
++ --enable-mini-icons \\
++ [other options]'
+ .EE
++.RE
+
+-The following example builds "all" GNOME menus (with some
+-mini\-icons in the system menu). You need to specify the
+-GNOME installation prefix if it is not /usr (with the
+-option \-\-install\-prefix). Moreover, the GNOME icons need to be in your
+-ImagePath and the non .png mini\-icons you use for the user\-menu
+-need to be in mini/ (if not, use the \-\-png\-icons\-path option and
+-the \-\-mini\-icons\-path option, respectively).
++The example above generates a menu with the Xdg menus as sub menus. If
++the sub menus should appear one level higher do this:
+
++.RS
+ .EX
+-Module FvwmGtk
+-*FvwmGtk: Destroy gnome-all
+-*FvwmGtk: Menu gnome-all
+-*FvwmGtk: Title "Gnome Menus"
+-*FvwmGtk: Separator
+-*FvwmGtk: Destroy gnome-sys
+-*FvwmGtk: Submenu "System" gnome-sys
+-*FvwmGtk: Destroy gnome-user
+-*FvwmGtk: Submenu "User" gnome-user
+-*FvwmGtk: Destroy gnome-redhat
+-*FvwmGtk: Submenu "RedHat" gnome-redhat
++AddToMenu MenuRoot "Root Menu" Title
+++ PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot'
++.EE
++.RE
++
++To generate single menus like \fIpreferences\fR:
+
+-PipeRead 'fvwm-menu-desktop --type gtk --enable-mini-icons --icon-folder :re --icon-app :re --icon-title :re --icon-toptitle :re'
++.RS
++.EX
++fvwm-menu-desktop --desktop kde --menu-type preferences --title FvwmPref \\
++ --enable-mini-icons -size 16 --with-titles
++.EE
++.RE
+
+-PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-user --enable-mini-icons'
++This generates a single KDE Preferences menu with top title
++"FvwmPref", mini icons with a size of 16x16 pixels and titles for each
++sub menu. But only if a menu with the name \fIpreferences\fR
++exists in the users or system wide Xdg directories. Else it's empty!
+
+-PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-redhat --enable-mini-icons'
++To add the generated menu to the "Utilities" menu for example put the
++following to your fvwm config file (~/.fvwm/config or ~/.fvwm/.fvwm2rc):
+
+-# To obtain the menu above with Alt-button1 on the root window
+-Mouse 1 R M SendToModule FvwmGtk gnome-all
++.RS
++.EX
++AddToMenu Utilities "Preferences Menu" Popup FvwmPref
++PipeRead 'fvwm-menu-desktop --desktop kde --menu-type preferences \\
++ --title FvwmPref [other options]'
+ .EE
++.RE
++
++If you think that \fBfvwm-menu-desktop\fR slows down your menu startup too
++much do not use \fBPipeRead\fR. Instead run \fBfvwm-menu-desktop\fR and
++redirect the menu to a file and read that file in your .fvwm2rc file.
+
+-You can specify FvwmGtk alias: Module FvwmGtk MyGnomeMenu.
+-In this case you must pass an additional parameter to fvwm-menu-desktop:
+-\-\-fvwmgtk-alias MyGnomeMenu.
+-
+-Of course you can build fvwm (i.e., no FvwmGtk) GNOME menus.
+-GNOME and KDE2 use PNG icons which are not supported by fvwm menu.
+-However, if you have XPM version of the GNOME or of the KDE2 (mini-)icons
+-you can build fvwm menus and style commands with these icons using the
+-option \-\-enable-tran-mini\-icons and \-\-enable\-tran\-style. The
+-Fvwm Themes package (http://fvwm-themes.sourceforge.net/) contains
+-an utility, fvwm-themes-images, which can convert automatically
+-(with the help of ImageMagick) all GNOME and KDE2 icons to XPM
+-icons.
+-
+-You can build sub menus using the \-\-dir options. However,
+-if you want to use more than one submenu
+-it is better to build the "all" menu and to use the submenu names.
+-See the option \-\-submenu\-name\-prefix for information on submenu
+-names. Nevertheless, you may put the menu in a tmp file using
+-redirection to see the submenu names.
+-
+-If you think that fvwm-menu-desktop slows your startup too much do
+-not use PipeRead. Instead run fvwm-menu-desktop
+-and
+-redirect the menu to a file and Read that file in
+-your .fvwm2rc file.
+-Another possibility is to use DynamicPopupAction
+-(with fvwm menu), the menu (and the styles) will be built only if
+-you pop up the menu. The
+-following menu creates a "kde\-all" menu which contains the user menu
+-which is built each time you pop up "kde\-all" and contains a pop up
+-to the system menu which is built only the first time you pop it up.
++.RS
+ .EX
+-AddToMenu kde\-all
+-+ DynamicPopupAction FuncRecreateKdeAll
++AddToMenu MenuRoot "XDG Menus" Popup FvwmMenu
++ ...
+
+-AddToMenu kde\-sys
+-+ DynamicPopupAction PipeRead 'fvwm-menu-desktop \\
+-\-\-desktop kde\-sys [options, but \-\-destroy-type d* or n*]'
+-
+-AddToFunc FuncRecreateKdeAll \\
+-I PipeRead 'fvwm-menu-desktop \\
+-\-\-desktop kde\-user \-\-enable\-mini\-icons \-\-name kde\-all \\
+-\-\-destroy-type dynamic [options you like]'
+-+ I AddToMenu "kde\-all" "" Nop
+-+ I AddToMenu "kde\-all" "Kde System%mini/mini\-k.xpm%" Popup kde\-sys
++AddToMenu FvwmMenu
+++ DynamicPopupAction Function FuncRecreateXdgMenus
++ ...
++
++DestroyFunc FuncRecreateXdgMenus
++AddToFunc FuncRecreateXdgMenus
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
+ .EE
++.RE
+
+-fvwm-menu-desktop takes into account your $LANG environment variable,
+-which may be overwritten using the --lang option.
++or if you want to show the menus directly in a normal "Root" menu use
++this:
+
+-Hint, if you need a different menu font or item format from the ones used
+-in the default MenuStyle, you may use the --menus-style option to assign
+-a non-default MenuStyle name to menus built by this script.
+-Don't forget to create a new menu style in your .fvwm2rc, using CopyMenuStyle
+-and MenuStyle commands.
++.RS
++.EX
++AddToMenu MenuRoot "Root Menu" Title
+++ FuncXdgMenusInRoot
++ ...
+
+-.SH OPTIONS
++DestroyFunc FuncXdgMenusInRoot
++AddToFunc FuncXdgMenusInRoot
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot \\
++ > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
++.EE
++.RE
+
+-.IP "Main Options"
++The problem here is, that you have to restart fvwm because items insserted
++into such a menu cannot be removed. For that BOTH menus must be regenerated:
+
+-.IP "\fB\-\-help\fR"
+-Show the help and exit.
+-.IP "\fB\-\-version\fR"
+-Show the version and exit.
+-.IP "\fB\-\-install-prefix\fR \fIDIR\fR"
+-The prefix of GNOME or KDE installation. Default
+-is /usr for GNOME (other common prefixes: /usr/local, /opt/gnome).
+-For KDE the default is $KDEDIR and you probably do not need
+-to use this option.
+-.IP "\fB\-\-desktop\fR \fINAME\fR"
+-Use gnome\-sys for the GNOME system menu (this is the default),
+-gnome\-user for
+-the GNOME user menu, gnome\-redhat for the AnotherLevel
+-menu of Red Hat,
+-gnome\-mandriva for Mandriva menudrake menus,
+-kde\-sys for the KDE system menu and kde\-user for
+-the KDE user menu. It may be useful to use KDE or GNOME as a flag with
+-the \-\-dir option.
+-.IP "\fB\-\-type\fR \fINAME\fR"
+-If NAME is fvwm, a native fvwm menu will be built (this is
+-the default). If NAME is gtk, a FvwmGtk menu will be built.
+-.IP "\fB\-\-fvwmgtk-alias\fR \fINAME\fR"
+-The name for then FvwmGtk module to use instead of default FvwmGtk.
+-.IP "\fB\-\-title\fR \fINAME\fR"
+-Define the menu title of the top menu. Default
+-is "Gnome System Menu" for gnome\-sys, "Gnome User Menu" for
+-gnome\-user, "Gnome Red Hat Menu" for gnome\-redhat,
+-"Gnome Mandriva Menu" for gnome\-mandriva. For KDE the
+-default is given by KDE itself (or are similar to GNOME title).
+-.IP "\fB\-\-name\fR \fINAME\fR"
+-Define the menu name of the top menu. Default is the \-\-desktop
+-name if you use one above.
+-.IP "\fB\-\-merge-user-menu\fR"
+-this option tries to merge the user menu
+-with the system menu (gnome-sys or kde-sys, based on the --desktop option)
+-and takes into account changes to the system menu that it is now
+-possible to do in the "user directory" (at least with KDE version 2
+-menu editor).
++.RS
++.EX
++AddToMenu MenuRoot DynamicPopupAction FuncMenuRoot
++
++DestroyFunc FuncMenuRoot
++AddToFunc FuncMenuRoot
+++ I DestroyMenu MenuRoot
+++ I AddToMenu MenuRoot DynamicPopupAction FuncMenuRoot
+++ I AddToMenu MenuRoot "Root Menu" Title
+++ I Popup XdgMenus
++
++AddToMenu XdgMenus DynamicPopupAction FuncXdgMenusInRoot
++
++DestroyFunc FuncXdgMenusInRoot
++AddToFunc FuncXdgMenusInRoot
+++ I AddToMenu XdgMenus DynamicPopupAction FuncXdgMenusInRoot
+++ I Test (f $[FVWM_USERDIR]/.menu) Read $[FVWM_USERDIR]/.menu
+++ I TestRC (!Match) PipeRead 'fvwm-menu-desktop --insert-in-menu MenuRoot \\
++ > $[FVWM_USERDIR]/.menu \\
++ && echo "Read $[FVWM_USERDIR]/.menu"'
++.EE
++.RE
+
+
+-.IP "Icons Options"
++.SH GUI
++There's a \fBFvwmForm\fR GUI to setup the menu generation manually. It
++is found in the root of the generated menu called "Regenerate XDG Menu(s)".
+
+-By default, fvwm-menu-desktop builds mini\-icon free menus. To enable
+-mini\-icons use one of the two following options.
++Or it can be started from within \fBFvwmConsole\fR with
+
+-.IP "\fB\-\-enable\-mini\-icons\fR"
+-This option enables mini\-icons in the menu.
+-The desktop hints are used if it is possible
+-(fvwm menu can't use .png icons). Use
+-the \-\-mini\-icons\-path and the \-\-png\-icons\-path to specify
+-the good paths. By using the \-\-icon-* options below you
+-can control mini\-icons in menus.
+-.IP "\fB\-\-enable\-tran\-mini\-icons\fR"
+-This option applies only to fvwm menus and is useful to build GNOME or KDE2
+-menus with mini\-icons (and if you have XPM version of the GNOME or KDE2
+-PNG icons).
+-If this option is used any
+-icon hint foo.png is translated to path/foo.xpm
+-where path is determined by the \-\-tran\-mini\-icons\-path option
+-(xpm icons are used as with the previous option).
+-.IP "\fB\-\-mini\-icons\-path\fR \fIDIR\fR"
+-Define the directory of the .xpm mini\-icons (relative to your
+-ImagePath). Default is "mini/".
+-.IP "\fB\-\-png\-icons\-path\fR \fIDIR\fR"
+-Define the directory of .png icons. Default is "" (i.e., in your
+-ImagePath). Useful only with FvwmGtk menus.
+-.IP "\fB\-\-tran\-mini\-icons\-path\fR \fIDIR\fR"
+-Define the directory of the mini\-icons for the \-\-enable\-tran\-mini\-icons
+-option. Default is mini/. It is
+-preferable to give the complete path so that fvwm-menu-desktop can check
+-if the translated mini\-icons exists (and the "re" law will apply in
+-a good way).
+-.IP "\fB\-\-check\-mini\-icons\fR \fIPATH\fR"
+-Where PATH is a list of directories with ":" as a separator. Then,
+-fvwm-menu-desktop checks that the mini icons actually exist in one of
+-these directories (this check is not done for the translated mini icons).
+-
+-.IP Comments
+-
+-To control mini\-icons in menus you can use the 4 following options
+-which work similarly.
+-
+-In these options \fIlaw\fR may be \fIno\fR, \fIdh\fR, \fIre\fR or \fIow\fR.
+-\fIno\fR means "do not use mini\-icon" (this does not affect side pic).
+-\fIdh\fR means "use only the mini\-icons GNOME/KDE hints".
+-\fIre\fR means "use mini\-icons GNOME/KDE hints but if it is empty
+-use the specified mini\-icon".
+-\fIow\fR means "override the mini\-icons GNOME/KDE hints by the specified
+-mini\-icon".
+-
+-The path to the specified icons is given by the
+-options \-\-mini\-icons\-path, \-\-png\-icons\-path
+-or \-\-tran\-mini\-icons\-path (i.e., you just have to
+-specify the icon, the path is computed). For the sidepic you need to
+-give the complete relative path from your ImagePath.
+-
+-Note that for the fvwm menu (without the \-\-enable\-tran\-mini\-icons option)
+-a .png icon hint is
+-considered as an empty hint, so for the system menu use no=dh and re=ow
+-(you may use .xpm icons in a user menu). If
+-the \-\-tran\-mini\-icons\-path option is set with a complete path,
+-then if the .xpm icon which corresponds to a .png icon hint
+-does not exist, the icon hint is considered as empty.
+-
+-
+-\fIplace\fR, \fIsidepic\fR and \fIcolor\fR
+-apply only with fvwm menus. \fIplace\fR is either left or up.
+-\fIleft\fR means that the icon will be placed on the left of the
+-label. \fIup\fR means that the icon will be placed above the label.
+-\fIsidepic\fR needs to be nothing or an icon (for a picture in the
+-bottom left of the menu). \fIcolor\fR applies only
+-if a sidepic icon is given and it is the color for the region of the menu
+-containing the sidepic picture.
+-
+-When you use an option below, if an icon, a law ...etc is not
+-specified (i.e., empty) the default is used (e.g, if you want,
+-for an fvwm menu, the icon folder.xpm on the left of the top title
+-and the sidepic fvwm2.xpm on the left of this menu
+-use the following: \-\-icon\-toptitle :ow::fvwm2.xpm).
+-
+-.IP "\fB\-\-icon-toptitle\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Mini\-icon for the top title and sidepic for the top menu.
+-Default for fvwm menus: folder.xpm:no:left::.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons:
+-gnome\-logo\-icon\-transparent.xpm:no:left:.
+-Default for gtk menus:
+-gnome\-logo\-icon\-transparent.png:no.
+-.IP "\fB\-\-icon\-title\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Use the option below for submenus.
+-Default for fvwm menus: folder.xpm:dh:left::.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons:
+-gnome\-folder.xpm:dh:left::.
+-Default for gtk menus: gnome\-folder.png:dh
+-.IP "\fB\-\-icon\-folder\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR:\fIsidepic\fR:\fIcolor\fR"
+-Mini-icons for pop up item.
+-Default for fvwm menus: folder.xpm:dh:left.
+-Default for fvwm menus with \-\-enable\-tran\-mini\-icons: gnome\-folder.xpm:dh:left.
+-Default for gtk menus: gnome\-folder.png:dh.
+-.IP "\fB\-\-icon\-app\fR \fImicon\fR:\fIlaw\fR:\fIplace\fR"
+-Mini\-icon for applications item.
+-Default for fvwm menus: mini\-x.xpm:dh.
+-Default for fvwm menus
+-with \-\-enable\-tran\-mini\-icons: gnome\-default.xpm:dh.
+-Default for gtk menus: gnome\-default.png:dh
+-
+-.IP \fB--wm-icons\fR
+-This is a shortcut, which can be used if you plan to use icons from the
+-wm-icons package. Currently this is equivalent to:
+-\-\-enable\-mini\-icons
+-\-\-mini\-icons\-path ''
+-\-\-icon\-toptitle menu/folder-open.xpm:ow
+-\-\-icon\-title menu/folder-open.xpm:ow
+-\-\-icon\-folder menu/folder.xpm:ow
+-\-\-icon\-app menu/utility.xpm:ow.
+-
+-.IP "Style Options"
+-
+-.IP "\fB\-\-enable-style\fR \fImini\-icon\fR:\fIicon\fR:\fIlaw\fR:\fIaddstyle\fR"
+-Build icons and mini\-icons style commands for the applications in the built
+-menu.
+-.IP "\fB\-\-style\-tran\fR"
+-Only useful with FvwmGtk GNOME or KDE2 menus. Make translation as the
+-enable\-tran\-mini\-icon option but only for style
+-(not for mini\-icons menus).
+-.IP "\fB\-\-icon-style\fR \fImini\-icon\fR:\fIicon\fR:\fIlaw\fR:\fIaddstyle\fR"
+-This option
+-is similar to the options \-\-icon-* above. Default law is "dh"
+-(there is no "no" law).
+-Default mini\-icon is mini\-x.xpm and default icon
+-is x.xpm. You can add a style to all applications with
+-addstyle. If you use the enable\-tran\-mini\-icon options the translated
+-(mini\-)icons will be used (if translation is needed)
+-and the default icons are gnome\-default.xpm.
+-If you use the \-\-enable\-tran\-style options above the default icons
+-are gnome\-default.xpm.
+-The paths to mini\-icons are the same as those for the menus. The
+-path to the icons is computed from the mini\-icons path: they are one
+-directory up to the corresponding mini\-icons path (so the "defaults"
+-are "" and this is consistent with KDE1 and XPM icons builded by
+-fvwm-themes-images).
+-.IP "\fB\-\-icons\-path\fR \fIDIR\fR"
+-Not useful in a normal situation.
+-Define the directory of the icons. Default is one directory up from
+-the path given by the \-\-mini\-icons\-path option. To set the path to ""
+-you need to use "inpath".
+-.IP "\fB\-\-tran\-icons\-path\fR \fIDIR\fR"
+-Similar to the above option.
+-.IP "\fB\-\-check\-icons\fR \fIPATH\fR"
+-Where PATH is a list of directories with ":" as a separator. Then,
+-fvwm-menu-desktop checks that the icons actually exist in one of
+-these directories (this chack is not done for the translated icons, use a
+-full path in --tran-icons-path to do so).
+-
+-.IP "Other Options"
+-
+-.IP "\fB\-\-submenu\-name\-prefix\fR \fINAME\fR"
+-May be useful in some unfortunate cases. By default the name of a sub menu
+-is of the form prefix\-adirname\-level where prefix is the desktop
+-flag, adirname is the name of the directory of the description of the
+-sub menus (not a complete path) and where level is an integer equal to
+-the number of "cd"s you need to do to go from the root to the directory of the
+-description of the sub menus. You may change the prefix using the
+-present option.
+-.IP "\fB\-\-dir\fR \fIDIR\fR"
+-Set the directory where fvwm-menu-desktop
+-looks for a GNOME/KDE menu description to \fIDIR\fR.
+-The name of the menu is 'desktop\-name' and the title is 'desktop' name
+-where 'desktop' is either GNOME or
+-KDE (if fvwm-menu-desktop can't find which desktop is concerned, you can
+-help with the \-\-desktop option) and where 'name' is the name of the
+-right directory of \fIDIR\fR (or a hint of the desktop for the title).
+-Note that if this option is not set, the description directory is
+-install\-prefix/share/gnome/apps if \-\-desktop is gnome\-sys,
+-$HOME/.gnome/apps if \-\-desktop is gnome\-user,
+-$HOME/.gnome/apps\-redhat if \-\-desktop is gnome\-redhat,
+-$HOME/.gnome/apps\-mdk if \-\-desktop is gnome\-mandriva,
+-$KDEDIR/share/applink if \-\-desktop is kde\-sys and
+-$HOME/.kde/share/applnk if\-\-desktop is sys\-user.
+-.IP "\fB\-\-destroy\-type\fR \fIflag\fR"
+-flag may be "y(es)", "no", "d(ynamic)". Default is "yes" with fvwm menus,
+-"no" with FvwmGtk menus and dynamic applies only with fvwm menus.
+-If "yes" is used the top menu will be destroyed (DestroyMenu "name"),
+-if "no" is used the top menu will not be destroyed (useful for FvwmGtk
+-menus called by another menu via FvwmGtkSubMenu or to give the same
+-name to two or more menus built by fvwm-menu-desktop). If dynamic
+-is used the menu will be destroyed/recreated (may be useful with
+-DynamicPopupAction). Note that all the built sub menus are always
+-destroyed.
+-.IP "\fB\-\-xterm\fR \fICMD\fR"
+-Define complete X terminal command to run applications in it if needed.
+-Default is 'xterm -e'.
+-.IP "\fB\-\-lang\fR \fINAME\fR"
+-Default is the value of $LANG. Useful if your language is not GNOME/KDE
+-compliant and you prefer a non-English compliant
+-language. Also useful if fvwm-menu-desktop gives bad result with your language.
+-.IP "\fB\-\-utf8\fR"
+-Assume that the desktop entries used UTF-8 encoding. This is the case
+-with KDE version 2 and will be probably the case with GNOME version 2.
+-At the present time this option work only if you have perl version 5.6
+-or better and if your language use latin-1 font. If one of these conditions
+-is not satisfied, then this option is equivalent to \-\-lang en. For other
+-languages/charsets use the \-\-uniconv option. The advantage of this option
+-as compared to the following option is that it is fast.
+-.IP "\fB\-\-uniconv\fR \fIcharset\fR"
+-Use iconv, uniconv or internal method to translate utf8 desktop entries
+-into an appropriate "charset". You can choose between one of the supported
+-tools using \-\-uniconv-exec option. iconv comes with glibc >= 2.1.1 and
+-uniconv comes with the utf8 editor yudit. Type "iconv --list" or "man
+-uniconv" for the list of supported charsets. Of course you must also use the
+-appropriate font using the MenuStyle command. Also, $LANG (or --lang xx)
+-must be compatible with the charset. Note, if you don't use an internal
+-method, fvwm-menu-desktop is very slow with this option: you probably need
+-to use the --time-limit option and you should redirect the result into a
+-file and read this file in your fvwm configuration.
+-.IP "\fB\-\-uniconv-exec\fR \fIexec\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-menu-style\fR \fIname\fR"
+-By default the generated fvwm menus use the default MenuStyle (i.e., the
+-MenuStyle "*"). You can specify another MenuStyle name using this option.
+-.IP "\fB\-\-[no]check-app\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-time-limit\fR \fINUM\fR"
+-Not used, kept for legacy purposes.
+-.IP "\fB\-\-kde_config\fR \fIcommand\fR"
+-If available, this script uses the command kde-config or kde4-config
+-to find the XDG menus. If the kde-config command has another name
+-you can use this option to set the command name.
+-If this script can't find any kde-config command, it does it's best to run
+-without it.
++.RS
++.EX
++Module FvwmPerl -l fvwm-menu-desktop-config.fpl
++.EE
++.RE
+
+ .SH BUGS
+-This script needs more testing to see if all options work well
+-(note that the script does not check for inconsistency of the given options).
+-If Desktop menu hints are changed the script may not work as
+-expected. I have tested the script with gnome-core-1.0.3, kde-1.1, kde-1.2
+-and kde-2.0.
++The whole process of creating menus from files is slow.
++Otherwise report bugs to the
++fvwm-workers mailing list <fvwm-workers@fvwm.org>.
++
+
+ .SH AUTHORS
+-Olivier Chapuis <olivier.chapuis@free.fr>
++This script is based on fvwm-xdg-menu.py written by Piotr Zielinski
++(http://www.cl.cam.ac.uk/~pz215/) who assigned Licence: GPL 2 Date:
++03.12.2005.
++
++The script was reworked to replace the existing fvwm-menu-desktop perl
++script by the fvwm-workers.
+
+-Mikhael Goikhman <migo@homemail.com> - some changes
+
+ .SH COPYING
+-The script is distributed by the same terms as fvwm itself.
+-See GNU General Public License for details.
++The script is distributed by the same terms as fvwm itself. See GNU
++General Public License for details.
+--- config.guess
++++ config.guess 2012-10-11 18:46:20.000000000 +0000
+@@ -2,9 +2,9 @@
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2011-05-11'
++timestamp='2012-02-10'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,9 +17,7 @@ timestamp='2011-05-11'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+-Software Foundation, Inc.
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -792,13 +790,12 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -807,6 +804,9 @@ EOF
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+@@ -861,6 +861,13 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+@@ -895,13 +902,16 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+@@ -943,7 +953,7 @@ EOF
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+@@ -978,13 +988,13 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ tile*:Linux:*:*)
+- echo ${UNAME_MACHINE}-tilera-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -1315,6 +1325,9 @@ EOF
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
++ x86_64:VMkernel:*:*)
++ echo ${UNAME_MACHINE}-unknown-esx
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+--- config.h.in
++++ config.h.in 2012-10-11 18:46:19.000000000 +0000
+@@ -280,6 +280,9 @@
+ /* Define to 1 if you have the `waitpid' function. */
+ #undef HAVE_WAITPID
+
++/* Define if Xkb extension is used. */
++#undef HAVE_X11_XKBLIB_H
++
+ /* Define if Xcursor library is used. */
+ #undef HAVE_XCURSOR
+
+@@ -631,6 +634,14 @@
+ #define fvwm_lstat(x,y) -1
+ #endif
+
++#ifdef HAVE_X11_XKBLIB_H
++#include <X11/XKBlib.h>
++#define fvwm_KeycodeToKeysym(d, k, g, l) \
++ (XkbKeycodeToKeysym((d), (k), (g), (l)))
++#else
++#define fvwm_KeycodeToKeysym(d, k, i, x) (XKeycodeToKeysym((d), (k), (i)))
++#endif
++
+
+
+ /* Define to empty if `const' does not conform to ANSI C. */
+--- config.sub
++++ config.sub 2012-10-11 18:46:20.000000000 +0000
+@@ -2,9 +2,9 @@
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2011-03-23'
++timestamp='2012-02-10'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@ timestamp='2011-03-23'
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -76,8 +74,8 @@ version="\
+ GNU config.sub ($timestamp)
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+-Software Foundation, Inc.
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -132,6 +130,10 @@ case $maybe_os in
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
++ android-linux)
++ os=-linux-android
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+@@ -247,17 +249,22 @@ case $basic_machine in
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
++ | aarch64 | aarch64_be \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
++ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -291,7 +298,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rx \
++ | rl78 | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -300,7 +307,7 @@ case $basic_machine in
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+@@ -315,8 +322,7 @@ case $basic_machine in
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+- # Motorola 68HC11/12.
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -329,7 +335,10 @@ case $basic_machine in
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+-
++ xgate)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+@@ -352,11 +361,13 @@ case $basic_machine in
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
++ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
++ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+@@ -365,8 +376,10 @@ case $basic_machine in
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -400,7 +413,7 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | romp-* | rs6000-* | rx-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -408,10 +421,11 @@ case $basic_machine in
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile-* | tilegx-* \
++ | tile*-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | vax-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -711,7 +725,6 @@ case $basic_machine in
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -808,10 +821,18 @@ case $basic_machine in
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -1120,13 +1141,8 @@ case $basic_machine in
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+- # This must be matched before tile*.
+- tilegx*)
+- basic_machine=tilegx-unknown
+- os=-linux-gnu
+- ;;
+ tile*)
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1336,7 +1352,7 @@ case $os in
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1548,9 +1564,6 @@ case $basic_machine in
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+--- configure
++++ configure 2012-10-11 18:46:19.000000000 +0000
+@@ -733,6 +733,7 @@ CPP
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
++am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+@@ -754,6 +755,15 @@ FVWM_DATADIR
+ FVWM_MODULEDIR
+ PERL
+ REQUIRED_PERL_VERSION
++pkgpyexecdir
++pyexecdir
++pkgpythondir
++pythondir
++PYTHON_PLATFORM
++PYTHON_EXEC_PREFIX
++PYTHON_PREFIX
++PYTHON_VERSION
++PYTHON
+ SED
+ am__untar
+ am__tar
+@@ -899,6 +909,7 @@ with_gnome
+ ac_precious_vars='build_alias
+ host_alias
+ target_alias
++PYTHON
+ XMKMF
+ CC
+ CFLAGS
+@@ -1627,6 +1638,7 @@ Optional Packages:
+ --with-gnome no, yes or prefix for GNOME files (for FvwmGtk only)
+
+ Some influential environment variables:
++ PYTHON the Python interpreter
+ XMKMF Path to xmkmf, Makefile generator for X Window System
+ CC C compiler command
+ CFLAGS C compiler flags
+@@ -2649,8 +2661,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-ISRELEASED=yes
+-version=2.6.5
++ISRELEASED=no
++version=2.6.6
+ VERSIONINFO=""
+
+ RELDATELONG="20 April 2012"
+@@ -3210,11 +3222,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
++# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AMTAR='$${TAR-tar}'
+
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+@@ -3264,6 +3276,234 @@ fi
+
+
+
++# optional python:
++
++
++
++
++
++
++ if test -n "$PYTHON"; then
++ # If the user set $PYTHON, use it and don't search something else.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5
++$as_echo_n "checking whether $PYTHON version >= 2.5... " >&6; }
++ prog="import sys
++# split strings by '.' and convert to numeric. Append some zeros
++# because we need at least 4 digits for the hex conversion.
++# map returns an iterator in Python 3.0 and a list in 2.x
++minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
++minverhex = 0
++# xrange is not present in Python 3.0 and range returns an iterator
++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
++ ($PYTHON -c "$prog") >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++ as_fn_error $? "too old" "$LINENO" 5
++fi
++ am_display_PYTHON=$PYTHON
++ else
++ # Otherwise, try each interpreter until we find one that satisfies
++ # VERSION.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.5" >&5
++$as_echo_n "checking for a Python interpreter with version >= 2.5... " >&6; }
++if ${am_cv_pathless_PYTHON+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++ test "$am_cv_pathless_PYTHON" = none && break
++ prog="import sys
++# split strings by '.' and convert to numeric. Append some zeros
++# because we need at least 4 digits for the hex conversion.
++# map returns an iterator in Python 3.0 and a list in 2.x
++minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
++minverhex = 0
++# xrange is not present in Python 3.0 and range returns an iterator
++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
++ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then :
++ break
++fi
++ done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
++$as_echo "$am_cv_pathless_PYTHON" >&6; }
++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
++ if test "$am_cv_pathless_PYTHON" = none; then
++ PYTHON=:
++ else
++ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
++set dummy $am_cv_pathless_PYTHON; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PYTHON+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PYTHON in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PYTHON=$ac_cv_path_PYTHON
++if test -n "$PYTHON"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
++$as_echo "$PYTHON" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ fi
++ am_display_PYTHON=$am_cv_pathless_PYTHON
++ fi
++
++
++ if test "$PYTHON" = :; then
++ :
++ else
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
++$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
++if ${am_cv_python_version+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
++$as_echo "$am_cv_python_version" >&6; }
++ PYTHON_VERSION=$am_cv_python_version
++
++
++
++ PYTHON_PREFIX='${prefix}'
++
++ PYTHON_EXEC_PREFIX='${exec_prefix}'
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
++$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
++if ${am_cv_python_platform+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
++$as_echo "$am_cv_python_platform" >&6; }
++ PYTHON_PLATFORM=$am_cv_python_platform
++
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
++$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
++if ${am_cv_python_pythondir+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "x$prefix" = xNONE
++ then
++ am_py_prefix=$ac_default_prefix
++ else
++ am_py_prefix=$prefix
++ fi
++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
++ case $am_cv_python_pythondir in
++ $am_py_prefix*)
++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
++ esac
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
++$as_echo "$am_cv_python_pythondir" >&6; }
++ pythondir=$am_cv_python_pythondir
++
++
++
++ pkgpythondir=\${pythondir}/$PACKAGE
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
++$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
++if ${am_cv_python_pyexecdir+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "x$exec_prefix" = xNONE
++ then
++ am_py_exec_prefix=$am_py_prefix
++ else
++ am_py_exec_prefix=$exec_prefix
++ fi
++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
++ case $am_cv_python_pyexecdir in
++ $am_py_exec_prefix*)
++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
++ esac
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
++$as_echo "$am_cv_python_pyexecdir" >&6; }
++ pyexecdir=$am_cv_python_pyexecdir
++
++
++
++ pkgpyexecdir=\${pyexecdir}/$PACKAGE
++
++
++
++ fi
++
++
++
+ #!!!
+ PERL=""
+ REQUIRED_PERL_VERSION=5.004
+@@ -3494,6 +3734,7 @@ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+@@ -4307,6 +4548,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -4366,7 +4608,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -5845,6 +6087,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -5904,7 +6147,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -7311,7 +7554,17 @@ fi
+
+ fi
+
+-# ********* xinerama
++# Silently look for X11/XKBlib.h
++
++ac_fn_c_check_header_mongrel "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "$ac_includes_default"
++if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then :
++ $as_echo "#define HAVE_X11_XKBLIB_H 1" >>confdefs.h
++
++fi
++
++
++
++# ********* xineramA
+ problem_xinerama=""
+
+ # Check whether --enable-xinerama was given.
+--- configure.ac
++++ configure.ac 2012-06-22 17:12:06.000000000 +0000
+@@ -4,8 +4,8 @@ AC_PREREQ(2.60)
+ AC_INIT(fvwm/fvwm.c)
+
+ dnl should be "yes" only within the released distribution
+-ISRELEASED=yes
+-version=2.6.5
++ISRELEASED=no
++version=2.6.6
+ VERSIONINFO=""
+
+ dnl date of the released version (please zero pad the day in the last 2 dates)
+@@ -75,6 +75,9 @@ AM_CONFIG_HEADER(config.h)
+ AC_CHECK_PROG(SED, sed, sed, "")
+ AC_SUBST(SED)
+
++# optional python:
++AM_PATH_PYTHON([2.5],, [:])
++
+ #!!!
+ PERL=""
+ REQUIRED_PERL_VERSION=5.004
+@@ -537,7 +540,11 @@ if test ! x"$with_shm" = xno; then
+ [$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
+ fi
+
+-# ********* xinerama
++# Silently look for X11/XKBlib.h
++AH_TEMPLATE([HAVE_X11_XKBLIB_H],[Define if Xkb extension is used.])
++AC_CHECK_HEADER(X11/XKBlib.h, AC_DEFINE(HAVE_X11_XKBLIB_H))
++
++# ********* xineramA
+ problem_xinerama=""
+
+ AC_ARG_ENABLE(xinerama,
+@@ -1657,6 +1664,14 @@ AH_VERBATIM([_ZEND_EXPLICIT_DEFINITIONS]
+ #define fvwm_lstat(x,y) -1
+ #endif
+
++#ifdef HAVE_X11_XKBLIB_H
++#include <X11/XKBlib.h>
++#define fvwm_KeycodeToKeysym(d, k, g, l) \
++ (XkbKeycodeToKeysym((d), (k), (g), (l)))
++#else
++#define fvwm_KeycodeToKeysym(d, k, i, x) (XKeycodeToKeysym((d), (k), (i)))
++#endif
++
+ ])
+
+ # mainly for fvwm-config
+--- debian/Makefile.in
++++ debian/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES = control
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -161,6 +183,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -235,11 +262,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -379,10 +410,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- depcomp
++++ depcomp 2012-10-11 18:46:20.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2012-03-27.16; # UTC
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+-# Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -28,7 +28,7 @@ scriptversion=2009-04-28.21; # UTC
+
+ case $1 in
+ '')
+- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+@@ -40,11 +40,11 @@ as side-effects.
+
+ Environment variables:
+ depmode Dependency tracking mode.
+- source Source file read by `PROGRAMS ARGS'.
+- object Object file output by `PROGRAMS ARGS'.
++ source Source file read by 'PROGRAMS ARGS'.
++ object Object file output by 'PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+- tmpdepfile Temporary file to use when outputing dependencies.
++ tmpdepfile Temporary file to use when outputting dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake@gnu.org>.
+@@ -57,6 +57,12 @@ EOF
+ ;;
+ esac
+
++# A tabulation character.
++tab=' '
++# A newline character.
++nl='
++'
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+@@ -90,10 +96,24 @@ if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+- cygpath_u="sed s,\\\\\\\\,/,g"
++ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
+ fi
+
++if test "$depmode" = msvc7msys; then
++ # This is just like msvc7 but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvc7
++fi
++
++if test "$depmode" = xlc; then
++ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++ gccflag=-qmakedep=gcc,-MF
++ depmode=gcc
++fi
++
+ case "$depmode" in
+ gcc3)
+ ## gcc 3 implements dependency tracking that does exactly what
+@@ -148,20 +168,21 @@ gcc)
+ ## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+-## This next piece of magic avoids the `deleted header file' problem.
++## This next piece of magic avoids the "deleted header file" problem.
+ ## The problem is that when a header file which appears in a .P file
+ ## is deleted, the dependency causes make to die (because there is
+ ## typically no way to rebuild the header). We avoid this by adding
+ ## dummy dependencies for each header file. Too bad gcc doesn't do
+ ## this for us directly.
+- tr ' ' '
+-' < "$tmpdepfile" |
+-## Some versions of gcc put a space before the `:'. On the theory
++ tr ' ' "$nl" < "$tmpdepfile" |
++## Some versions of gcc put a space before the ':'. On the theory
+ ## that the space means something, we add a space to the output as
+-## well.
++## well. hp depmode also adds that space, but also prefixes the VPATH
++## to the object. Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++ | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -193,18 +214,15 @@ sgi)
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+- # the IRIX cc adds comments like `#:fec' to the end of the
++ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+- tr '
+-' ' ' >> "$depfile"
++ tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
+
+ # The second pass generates a dummy entry for each header file.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+@@ -216,10 +234,17 @@ sgi)
+ rm -f "$tmpdepfile"
+ ;;
+
++xlc)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+ # in a .u file. In older versions, this file always lives in the
+- # current directory. Also, the AIX compiler puts `$object:' at the
++ # current directory. Also, the AIX compiler puts '$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+@@ -249,12 +274,11 @@ aix)
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form 'foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a tab and a space in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -265,23 +289,26 @@ aix)
+ ;;
+
+ icc)
+- # Intel's C compiler understands `-MD -MF file'. However on
+- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++ # However on
++ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+- # which is wrong. We want:
++ # which is wrong. We want
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+- # and will wrap long lines using \ :
++ # and will wrap long lines using '\':
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+-
++ # tcc 0.9.26 (FIXME still under development at the moment of writing)
++ # will emit a similar output, but also prepend the continuation lines
++ # with horizontal tabulation characters.
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+@@ -290,15 +317,21 @@ icc)
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h',
+- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++ # Each line is of the form 'foo.o: dependent.h',
++ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process this invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+- sed -e 's/$/ :/' >> "$depfile"
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
++ < "$tmpdepfile" > "$depfile"
++ sed '
++ s/[ '"$tab"'][ '"$tab"']*/ /g
++ s/^ *//
++ s/ *\\*$//
++ s/^[^:]*: *//
++ /^$/d
++ /:$/d
++ s/$/ :/
++ ' < "$tmpdepfile" >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -334,7 +367,7 @@ hp2)
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+- # Add `dependent.h:' lines.
++ # Add 'dependent.h:' lines.
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+@@ -349,9 +382,9 @@ hp2)
+
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
++ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+- # dependencies in `foo.d' instead, so we check for that too.
++ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+@@ -397,14 +430,59 @@ tru64)
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a tab and a space in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
++msvc7)
++ if test "$libtool" = yes; then
++ showIncludes=-Wc,-showIncludes
++ else
++ showIncludes=-showIncludes
++ fi
++ "$@" $showIncludes > "$tmpdepfile"
++ stat=$?
++ grep -v '^Note: including file: ' "$tmpdepfile"
++ if test "$stat" = 0; then :
++ else
++ rm -f "$tmpdepfile"
++ exit $stat
++ fi
++ rm -f "$depfile"
++ echo "$object : \\" > "$depfile"
++ # The first sed program below extracts the file names and escapes
++ # backslashes for cygpath. The second sed program outputs the file
++ # name when reading, but also accumulates all include files in the
++ # hold buffer in order to output them again at the end. This only
++ # works with sed implementations that can handle large buffers.
++ sed < "$tmpdepfile" -n '
++/^Note: including file: *\(.*\)/ {
++ s//\1/
++ s/\\/\\\\/g
++ p
++}' | $cygpath_u | sort -u | sed -n '
++s/ /\\ /g
++s/\(.*\)/'"$tab"'\1 \\/p
++s/.\(.*\) \\/\1:/
++H
++$ {
++ s/.*/'"$tab"'/
++ G
++ p
++}' >> "$depfile"
++ rm -f "$tmpdepfile"
++ ;;
++
++msvc7msys)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ #nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+@@ -422,7 +500,7 @@ dashmstdout)
+ shift
+ fi
+
+- # Remove `-o $object'.
++ # Remove '-o $object'.
+ IFS=" "
+ for arg
+ do
+@@ -442,15 +520,14 @@ dashmstdout)
+ done
+
+ test -z "$dashmflag" && dashmflag=-M
+- # Require at least two characters before searching for `:'
++ # Require at least two characters before searching for ':'
+ # in the target name. This is to cope with DOS-style filenames:
+- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+ "$@" $dashmflag |
+- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
++ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tr ' ' '
+-' < "$tmpdepfile" | \
++ tr ' ' "$nl" < "$tmpdepfile" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -503,9 +580,10 @@ makedepend)
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+- cat < "$tmpdepfile" > "$depfile"
+- sed '1,2d' "$tmpdepfile" | tr ' ' '
+-' | \
++ # makedepend may prepend the VPATH from the source file name to the object.
++ # No need to regex-escape $object, excess matching of '.' is harmless.
++ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
++ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -525,7 +603,7 @@ cpp)
+ shift
+ fi
+
+- # Remove `-o $object'.
++ # Remove '-o $object'.
+ IFS=" "
+ for arg
+ do
+@@ -594,8 +672,8 @@ msvisualcpp)
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+- echo " " >> "$depfile"
++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
++ echo "$tab" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+--- doc/ChangeLog
++++ doc/ChangeLog 2012-06-22 17:12:06.000000000 +0000
+@@ -1,3 +1,7 @@
++2012-06-22 Dan Espen <despen@verizon.net>
++
++ * commands/Style.xml: Cleanup iconsize.
++
+ 2011-09-27 Thomas Adam <thomas@fvwm.org>
+ * commands/Style.xml:
+ Add tiny note about IconTitleFormat.
+--- doc/Makefile.in
++++ doc/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+ # Author: Scott Smedley
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -57,6 +74,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -78,6 +100,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+@@ -227,6 +255,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -301,11 +334,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -393,8 +430,11 @@ footer.html: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -408,9 +448,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -579,13 +617,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -623,10 +658,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/commands/Makefile.in
++++ doc/commands/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -340,8 +377,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -355,9 +395,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -412,10 +450,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/commands/Style.xml
++++ doc/commands/Style.xml 2012-06-22 17:12:06.000000000 +0000
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<!-- $Id: Style.xml,v 1.15.2.3 2011/09/27 21:53:42 tadam Exp $ -->
++<!-- $Id: Style.xml,v 1.15.2.4 2012/06/22 15:12:06 dane Exp $ -->
+ <!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "../docbook-xml/docbookx.dtd"
+ [
+@@ -1011,7 +1011,7 @@ grid is 3 by 3 pixels which gives a tigh
+ get a more regular appearance use a grid larger than your largest
+ icon. Use the
+ <emphasis>IconSize</emphasis>
+-definition to clip an icon to a maximum size. An
++argument to clip or stretch an icon to a maximum size. An
+ <emphasis remap='I'>IconGrid</emphasis>
+ definition must follow the
+ <emphasis remap='B'>IconBox</emphasis>
+@@ -1050,6 +1050,7 @@ definition that it applies to:</para>
+ Style * IconBox -80x240-1-1, IconFill b r
+ </programlisting>
+
++<section id="IconSize">
+ <para>
+ <fvwmopt cmd="Style" opt="IconSize"/>
+ sets limits on the size of an icon image. Both user-provided
+@@ -1087,7 +1088,16 @@ dimension. This effectively places no l
+ <para>The value of "-1" can be used in place of any of the arguments to
+ specify the default value for that dimension.</para>
+
+-<para>Note that application-provided icon windows are not affected.</para>
++<para>In addition to the numeric arguments, 1 additional argument can be
++"Stretched", "Adjusted", or "Shrunk".
++</para>
++
++<para>Note that module provided icon managers are not affected by this style.</para>
++
++</section>
++
++
++
+
+ <para><fvwmopt cmd="Style" opt="MiniIcon"/>
+ specifies a pixmap to use as the miniature icon for the
+--- doc/docbook-xml/Makefile.in
++++ doc/docbook-xml/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -54,6 +71,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -201,6 +223,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -275,11 +302,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -535,13 +566,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -576,10 +604,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xml/ent/Makefile.in
++++ doc/docbook-xml/ent/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -383,10 +414,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/Makefile.in
++++ doc/docbook-xsl/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,6 +70,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -200,6 +222,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -274,11 +301,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -522,13 +553,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -563,10 +591,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/common/Makefile.in
++++ doc/docbook-xsl/common/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -383,10 +414,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/highlighting/Makefile.in
++++ doc/docbook-xsl/highlighting/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -364,10 +395,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/html/Makefile.in
++++ doc/docbook-xsl/html/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -404,10 +435,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/lib/Makefile.in
++++ doc/docbook-xsl/lib/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -364,10 +395,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/manpages/Makefile.in
++++ doc/docbook-xsl/manpages/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -378,10 +409,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/docbook-xsl/profiling/Makefile.in
++++ doc/docbook-xsl/profiling/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -160,6 +182,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -234,11 +261,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -365,10 +396,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/fvwm/Makefile.in
++++ doc/fvwm/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+ # Author: Scott Smedley
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -49,6 +66,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -70,6 +92,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
+ NROFF = nroff
+@@ -189,6 +217,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -263,11 +296,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -353,11 +390,18 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -386,13 +430,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -406,9 +451,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -476,10 +519,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/fvwm/fvwm.1
++++ doc/fvwm/fvwm.1 2012-10-11 18:46:59.000000000 +0000
+@@ -8481,7 +8481,7 @@ grid is 3 by 3 pixels which gives a tigh
+ get a more regular appearance use a grid larger than your largest
+ icon\. Use the
+ \fIIconSize\fR
+-definition to clip an icon to a maximum size\. An
++argument to clip or stretch an icon to a maximum size\. An
+ \fIIconGrid\fR
+ definition must follow the
+ \fBIconBox\fR
+@@ -8566,7 +8566,11 @@ dimension\. This effectively places no
+ The value of "\-1" can be used in place of any of the arguments to
+ specify the default value for that dimension\.
+ .PP
+-Note that application\-provided icon windows are not affected\.
++In addition to the numeric arguments, 1 additional argument can be
++"Stretched", "Adjusted", or "Shrunk"\.
++.PP
++Note that module provided icon managers are not affected by this style\.
++.RE
+ .PP
+ \fIMiniIcon\fR
+ specifies a pixmap to use as the miniature icon for the
+--- doc/images/Makefile.in
++++ doc/images/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+ # Author: Scott Smedley
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -56,6 +73,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -77,6 +99,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+@@ -226,6 +254,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -300,11 +333,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -381,8 +418,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -396,9 +436,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -567,13 +605,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -611,10 +646,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/images/svg_rendering/Makefile.in
++++ doc/images/svg_rendering/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+ # Author: Scott Smedley
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -49,6 +66,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -70,6 +92,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -186,6 +214,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -260,11 +293,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -346,8 +383,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -361,9 +401,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -418,10 +456,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/modules/Makefile.in
++++ doc/modules/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+ # Author: Scott Smedley
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -56,6 +73,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -77,6 +99,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+@@ -226,6 +254,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -300,11 +333,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -394,8 +431,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -409,9 +449,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -580,13 +618,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -624,10 +659,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/modules/images/FvwmTabs/Makefile.in
++++ doc/modules/images/FvwmTabs/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(docdir)"
+ DATA = $(doc_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -341,8 +378,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -356,9 +396,7 @@ uninstall-docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(docdir)" && rm -f $$files
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -413,10 +451,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- doc/modules/images/Makefile.in
++++ doc/modules/images/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,6 +70,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -200,6 +222,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -274,11 +301,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -519,13 +550,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -560,10 +588,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- docs/Makefile.in
++++ docs/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES = fvwm.lsm
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -161,6 +183,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -235,11 +262,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -368,10 +399,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- docs/fvwm.lsm
++++ docs/fvwm.lsm 2012-10-11 18:46:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ Begin4
+ Title: fvwm (F? Virtual Window Manager)
+-Version: 2.6.5
+-Entered-date: 2012-04-20
++Version: 2.6.6
++Entered-date: (not released yet)
+ Description: fvwm is an ICCCM-compliant X window manager providing a 3D
+ look for window decorations, multiple discontiguous virtual
+ desktops, a high degree of configurability, and an external
+@@ -10,10 +10,10 @@ Keywords: window manager, X11, vir
+ Author: Rob Nation, fvwm workers
+ Maintained-by: fvwm workers list <fvwm-workers@fvwm.org>
+ Primary-site: ftp.fvwm.org /pub/ftp
+- 2M fvwm-2.6.5.tar.gz
++ 2M fvwm-2.6.6.tar.gz
+ Alternate-site: metalab.unc.edu /pub/Linux/X11/window-managers/
+ 1k fvwm.lsm
+- 2M fvwm-2.6.5.tar.gz
++ 2M fvwm-2.6.6.tar.gz
+ Original-site:
+ Platforms: Unix, X
+ Copying-policy: GNU General Public License
+--- fvwm/Makefile.in
++++ fvwm/Makefile.in 2012-10-11 18:46:20.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -80,6 +97,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(fvwm_SOURCES)
+ DIST_SOURCES = $(fvwm_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -101,6 +123,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ DATA = $(config_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -218,6 +246,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -292,11 +325,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -415,8 +452,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -450,7 +490,7 @@ uninstall-binPROGRAMS:
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
++fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES) $(EXTRA_fvwm_DEPENDENCIES)
+ @rm -f fvwm$(EXEEXT)
+ $(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
+
+@@ -528,8 +568,11 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -543,9 +586,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -646,10 +687,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- fvwm/builtins.c
++++ fvwm/builtins.c 2012-06-16 13:40:41.000000000 +0000
+@@ -3853,7 +3853,7 @@ static Bool FKeysymToKeycode (Display *d
+
+ for (m = 0; m <= 8; ++m)
+ {
+- KeySym ks = XKeycodeToKeysym(dpy, *keycode, m);
++ KeySym ks = fvwm_KeycodeToKeysym(dpy, *keycode, m, 0);
+ if (ks == keysym)
+ {
+ switch (m)
+--- fvwm/events.c
++++ fvwm/events.c 2012-06-16 13:40:41.000000000 +0000
+@@ -2508,7 +2508,7 @@ void __handle_key(const evh_args_t *ea,
+ /* Here's a real hack - some systems have two keys with the
+ * same keysym and different keycodes. This converts all
+ * the cases to one keycode. */
+- kc = XKeysymToKeycode(dpy, XKeycodeToKeysym(dpy, te->xkey.keycode, 0));
++ kc = XKeysymToKeycode(dpy, fvwm_KeycodeToKeysym(dpy, te->xkey.keycode, 0, 0));
+
+ /* Check if there is something bound to the key */
+
+--- fvwm/menus.c
++++ fvwm/menus.c 2012-05-02 10:02:44.000000000 +0000
+@@ -930,6 +930,9 @@ static Bool __scan_for_pixmap(
+ {
+ fvwm_msg(WARN, "scanForPixmap",
+ "Couldn't load image from %s", name);
++ fvwm_msg(WARN, "scanForPixmap",
++ "Check that FVWM has support for the filetype it's "
++ "being asked to load.");
+
+ /* return true to make missing pictures not appear in the
+ * label/name */
+--- install-sh
++++ install-sh 2012-10-11 18:46:20.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2011-01-19.21; # UTC
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -156,6 +156,10 @@ while test $# -ne 0; do
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ shift;;
+
+ -T) no_target_directory=true;;
+@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$ds
+ fi
+ shift # arg
+ dst_arg=$arg
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ done
+ fi
+
+@@ -200,7 +208,11 @@ if test $# -eq 0; then
+ fi
+
+ if test -z "$dir_arg"; then
+- trap '(exit $?); exit' 1 2 13 15
++ do_exit='(exit $ret); exit $ret'
++ trap "ret=129; $do_exit" 1
++ trap "ret=130; $do_exit" 2
++ trap "ret=141; $do_exit" 13
++ trap "ret=143; $do_exit" 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+@@ -228,9 +240,9 @@ fi
+
+ for src
+ do
+- # Protect names starting with `-'.
++ # Protect names problematic for `test' and other utilities.
+ case $src in
+- -*) src=./$src;;
++ -* | [=\(\)!]) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -252,12 +264,7 @@ do
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+-
+ dst=$dst_arg
+- # Protect names starting with `-'.
+- case $dst in
+- -*) dst=./$dst;;
+- esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+@@ -385,7 +392,7 @@ do
+
+ case $dstdir in
+ /*) prefix='/';;
+- -*) prefix='./';;
++ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
+ esac
+
+@@ -403,7 +410,7 @@ do
+
+ for d
+ do
+- test -z "$d" && continue
++ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+--- libs/Bindings.c
++++ libs/Bindings.c 2012-06-16 13:40:41.000000000 +0000
+@@ -181,7 +181,7 @@ int AddBinding(
+ {
+ if (BIND_IS_MOUSE_BINDING(type) ||
+ STROKE_CODE(BIND_IS_STROKE_BINDING(type) ||)
+- (tkeysym = XKeycodeToKeysym(dpy, i, m)) == keysym)
++ (tkeysym = fvwm_KeycodeToKeysym(dpy, i, m, 0)) == keysym)
+ {
+ unsigned int add_modifiers = 0;
+ unsigned int bind_mask = 1;
+--- libs/Makefile.in
++++ libs/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -82,6 +99,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libfvwm_a_SOURCES)
+ DIST_SOURCES = $(libfvwm_a_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -198,6 +220,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -272,11 +299,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -383,7 +414,7 @@ $(am__aclocal_m4_deps):
+
+ clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libfvwm.a: $(libfvwm_a_OBJECTS) $(libfvwm_a_DEPENDENCIES)
++libfvwm.a: $(libfvwm_a_OBJECTS) $(libfvwm_a_DEPENDENCIES) $(EXTRA_libfvwm_a_DEPENDENCIES)
+ -rm -f libfvwm.a
+ $(libfvwm_a_AR) libfvwm.a $(libfvwm_a_OBJECTS) $(libfvwm_a_LIBADD)
+ $(RANLIB) libfvwm.a
+@@ -566,10 +597,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- libs/PictureImageLoader.c
++++ libs/PictureImageLoader.c 2012-05-04 15:18:09.000000000 +0000
+@@ -172,6 +172,8 @@ Bool PImageLoadSvg(FIMAGE_CMD_ARGS)
+
+ if (!USE_SVG)
+ {
++ fprintf(stderr, "[PImageLoadSvg]: Tried to load SVG file "
++ "when FVWM has not been compiled with SVG support.\n");
+ return False;
+ }
+
+@@ -410,6 +412,9 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS)
+ /* suppress compiler warning */
+ bit_depth = 0;
+
++ fprintf(stderr, "[PImageLoadPng]: Tried to load PNG file "
++ "when FVWM has not been compiled with PNG support.\n");
++
+ return False;
+ }
+ if (!(f = fopen(path, "rb")))
+@@ -560,6 +565,8 @@ Bool PImageLoadXpm(FIMAGE_CMD_ARGS)
+
+ if (!XpmSupport)
+ {
++ fprintf(stderr, "[PImageLoadXpm]: Tried to load XPM file "
++ "when FVWM has not been compiled with XPm Support.\n");
+ return False;
+ }
+ memset(&xpm_im, 0, sizeof(FxpmImage));
+--- missing
++++ missing 2012-10-11 18:46:20.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2012-01-06.13; # UTC
+
+ # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+-# 2008, 2009 Free Software Foundation, Inc.
++# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -84,7 +84,6 @@ Supported PROGRAM values:
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+- tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+@@ -122,15 +121,6 @@ case $1 in
+ # Not GNU programs, they don't have --version.
+ ;;
+
+- tar*)
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+- exit 1
+- fi
+- ;;
+-
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+@@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only ne
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only
+ touch $file
+ ;;
+
+- tar*)
+- shift
+-
+- # We have already tried tar in the generic part.
+- # Look for gnutar/gtar before invocation to avoid ugly error
+- # messages.
+- if (gnutar --version > /dev/null 2>&1); then
+- gnutar "$@" && exit 0
+- fi
+- if (gtar --version > /dev/null 2>&1); then
+- gtar "$@" && exit 0
+- fi
+- firstarg="$1"
+- if shift; then
+- case $firstarg in
+- *o*)
+- firstarg=`echo "$firstarg" | sed s/o//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- case $firstarg in
+- *h*)
+- firstarg=`echo "$firstarg" | sed s/h//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- fi
+-
+- echo 1>&2 "\
+-WARNING: I can't seem to be able to run \`tar' with the given arguments.
+- You may want to install GNU tar or Free paxutils, or check the
+- command line arguments."
+- exit 1
+- ;;
+-
+ *)
+ echo 1>&2 "\
+ WARNING: \`$1' is needed, and is $msg.
+--- modules/ChangeLog
++++ modules/ChangeLog 2012-07-31 04:37:43.000000000 +0000
+@@ -1,3 +1,26 @@
++2012-07-30 Dan Espen <despen@verizon.net>
++
++ * FvwmForm/FvwmForm.1.in: Document Separator feature.
++ * FvwmForm/FvwmForm.c: Add Separator feature.
++ * FvwmForm/FvwmForm.h: Add Separator Item.
++
++2012-06-29 Dan Espen <despen@verizon.net>
++
++ * FvwmForm/FvwmForm-Desktop: Support --with-titles, --size, --theme.
++
++2012-06-22 Dan Espen <despen@verizon.net>
++
++ * FvwmForm/FvwmForm-Desktop: Adapt to new python version.
++
++2012-06-16 Thomas Adam <thomas@fvwm.org>
++ * modules/FvwmIconBox/FvwmIconBox.c (parsekey, ExecuteKey):
++ * modules/FvwmIconBox/readconfig.c (ParseKeyEnter):
++ * modules/FvwmIconBox/x.c (xevent_loop):
++ * modules/FvwmScript/FvwmScript.c (ReadXServer, main):
++ Add detection of XKeycodeToKeysym as deprecated, and provide a wrapper
++ for it by way of fvwm_KeycodeToKeysym() to call the newer
++ XkbKeycodeToKeysum() where needed.
++
+ 2012-04-14 Thomas Adam <thomas@fvwm.org>
+ * modules/FvwmPager/x_pager.c (label_window_wrap):
+ New static function for wrapping window lables.
+--- modules/FvwmAnimate/Makefile.in
++++ modules/FvwmAnimate/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmAnimate_SOURCES)
+ DIST_SOURCES = $(FvwmAnimate_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -370,8 +407,11 @@ FvwmAnimate.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -405,7 +445,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmAnimate$(EXEEXT): $(FvwmAnimate_OBJECTS) $(FvwmAnimate_DEPENDENCIES)
++FvwmAnimate$(EXEEXT): $(FvwmAnimate_OBJECTS) $(FvwmAnimate_DEPENDENCIES) $(EXTRA_FvwmAnimate_DEPENDENCIES)
+ @rm -f FvwmAnimate$(EXEEXT)
+ $(LINK) $(FvwmAnimate_OBJECTS) $(FvwmAnimate_LDADD) $(LIBS)
+
+@@ -432,11 +472,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -465,9 +512,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -581,10 +626,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmAuto/Makefile.in
++++ modules/FvwmAuto/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmAuto_SOURCES)
+ DIST_SOURCES = $(FvwmAuto_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -367,8 +404,11 @@ FvwmAuto.1: $(top_builddir)/config.statu
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -402,7 +442,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmAuto$(EXEEXT): $(FvwmAuto_OBJECTS) $(FvwmAuto_DEPENDENCIES)
++FvwmAuto$(EXEEXT): $(FvwmAuto_OBJECTS) $(FvwmAuto_DEPENDENCIES) $(EXTRA_FvwmAuto_DEPENDENCIES)
+ @rm -f FvwmAuto$(EXEEXT)
+ $(LINK) $(FvwmAuto_OBJECTS) $(FvwmAuto_LDADD) $(LIBS)
+
+@@ -429,11 +469,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -462,9 +509,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -578,10 +623,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmBacker/Makefile.in
++++ modules/FvwmBacker/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmBacker_SOURCES)
+ DIST_SOURCES = $(FvwmBacker_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -375,8 +412,11 @@ FvwmBacker.1: $(top_builddir)/config.sta
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -410,7 +450,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmBacker$(EXEEXT): $(FvwmBacker_OBJECTS) $(FvwmBacker_DEPENDENCIES)
++FvwmBacker$(EXEEXT): $(FvwmBacker_OBJECTS) $(FvwmBacker_DEPENDENCIES) $(EXTRA_FvwmBacker_DEPENDENCIES)
+ @rm -f FvwmBacker$(EXEEXT)
+ $(LINK) $(FvwmBacker_OBJECTS) $(FvwmBacker_LDADD) $(LIBS)
+
+@@ -438,11 +478,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -471,13 +518,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -491,9 +539,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -607,10 +653,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmBanner/Makefile.in
++++ modules/FvwmBanner/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmBanner_SOURCES)
+ DIST_SOURCES = $(FvwmBanner_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -370,8 +407,11 @@ FvwmBanner.1: $(top_builddir)/config.sta
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -405,7 +445,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmBanner$(EXEEXT): $(FvwmBanner_OBJECTS) $(FvwmBanner_DEPENDENCIES)
++FvwmBanner$(EXEEXT): $(FvwmBanner_OBJECTS) $(FvwmBanner_DEPENDENCIES) $(EXTRA_FvwmBanner_DEPENDENCIES)
+ @rm -f FvwmBanner$(EXEEXT)
+ $(LINK) $(FvwmBanner_OBJECTS) $(FvwmBanner_LDADD) $(LIBS)
+
+@@ -432,11 +472,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -465,9 +512,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -581,10 +626,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmButtons/Makefile.in
++++ modules/FvwmButtons/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -67,6 +84,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmButtons_SOURCES)
+ DIST_SOURCES = $(FvwmButtons_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -88,6 +110,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -208,6 +236,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -282,11 +315,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -382,8 +419,11 @@ FvwmButtons.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -417,7 +457,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmButtons$(EXEEXT): $(FvwmButtons_OBJECTS) $(FvwmButtons_DEPENDENCIES)
++FvwmButtons$(EXEEXT): $(FvwmButtons_OBJECTS) $(FvwmButtons_DEPENDENCIES) $(EXTRA_FvwmButtons_DEPENDENCIES)
+ @rm -f FvwmButtons$(EXEEXT)
+ $(LINK) $(FvwmButtons_OBJECTS) $(FvwmButtons_LDADD) $(LIBS)
+
+@@ -451,11 +491,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -484,13 +531,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -504,9 +552,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -620,10 +666,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmCommand/Makefile.in
++++ modules/FvwmCommand/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -75,6 +92,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -96,6 +118,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -247,6 +275,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -321,11 +354,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -418,8 +455,11 @@ FvwmCommand.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -455,8 +495,11 @@ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -490,10 +533,10 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmCommand$(EXEEXT): $(FvwmCommand_OBJECTS) $(FvwmCommand_DEPENDENCIES)
++FvwmCommand$(EXEEXT): $(FvwmCommand_OBJECTS) $(FvwmCommand_DEPENDENCIES) $(EXTRA_FvwmCommand_DEPENDENCIES)
+ @rm -f FvwmCommand$(EXEEXT)
+ $(LINK) $(FvwmCommand_OBJECTS) $(FvwmCommand_LDADD) $(LIBS)
+-FvwmCommandS$(EXEEXT): $(FvwmCommandS_OBJECTS) $(FvwmCommandS_DEPENDENCIES)
++FvwmCommandS$(EXEEXT): $(FvwmCommandS_OBJECTS) $(FvwmCommandS_DEPENDENCIES) $(EXTRA_FvwmCommandS_DEPENDENCIES)
+ @rm -f FvwmCommandS$(EXEEXT)
+ $(LINK) $(FvwmCommandS_OBJECTS) $(FvwmCommandS_LDADD) $(LIBS)
+
+@@ -522,11 +565,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -555,13 +605,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-moduleDATA: $(module_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_DATA)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -575,9 +626,7 @@ uninstall-moduleDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(module_DATA)'; test -n "$(moduledir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -759,13 +808,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -803,10 +849,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmCommand/scripts/Makefile.in
++++ modules/FvwmCommand/scripts/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -48,6 +65,11 @@ CONFIG_CLEAN_VPATH_FILES =
+ SCRIPTS = $(noinst_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -162,6 +184,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -236,11 +263,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -372,10 +403,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmConsole/Makefile.in
++++ modules/FvwmConsole/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -80,6 +97,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ SCRIPTS = $(module_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -91,6 +114,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmConsole_SOURCES) $(FvwmConsoleC_SOURCES)
+ DIST_SOURCES = $(FvwmConsole_SOURCES) $(FvwmConsoleC_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -210,6 +238,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -284,11 +317,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -385,8 +422,11 @@ FvwmConsoleC.pl: $(top_builddir)/config.
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -420,16 +460,19 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmConsole$(EXEEXT): $(FvwmConsole_OBJECTS) $(FvwmConsole_DEPENDENCIES)
++FvwmConsole$(EXEEXT): $(FvwmConsole_OBJECTS) $(FvwmConsole_DEPENDENCIES) $(EXTRA_FvwmConsole_DEPENDENCIES)
+ @rm -f FvwmConsole$(EXEEXT)
+ $(LINK) $(FvwmConsole_OBJECTS) $(FvwmConsole_LDADD) $(LIBS)
+-FvwmConsoleC$(EXEEXT): $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_DEPENDENCIES)
++FvwmConsoleC$(EXEEXT): $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_DEPENDENCIES) $(EXTRA_FvwmConsoleC_DEPENDENCIES)
+ @rm -f FvwmConsoleC$(EXEEXT)
+ $(LINK) $(FvwmConsoleC_OBJECTS) $(FvwmConsoleC_LDADD) $(LIBS)
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -457,9 +500,7 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -486,11 +527,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -519,9 +567,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -635,10 +681,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmCpp/Makefile.in
++++ modules/FvwmCpp/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmCpp_SOURCES)
+ DIST_SOURCES = $(FvwmCpp_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -371,8 +408,11 @@ FvwmCpp.1: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -406,7 +446,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmCpp$(EXEEXT): $(FvwmCpp_OBJECTS) $(FvwmCpp_DEPENDENCIES)
++FvwmCpp$(EXEEXT): $(FvwmCpp_OBJECTS) $(FvwmCpp_DEPENDENCIES) $(EXTRA_FvwmCpp_DEPENDENCIES)
+ @rm -f FvwmCpp$(EXEEXT)
+ $(LINK) $(FvwmCpp_OBJECTS) $(FvwmCpp_LDADD) $(LIBS)
+
+@@ -433,11 +473,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -466,9 +513,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -582,10 +627,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmDebug/Makefile.in
++++ modules/FvwmDebug/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -71,6 +88,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"
+ SCRIPTS = $(module_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -83,6 +106,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmOldDebug_SOURCES)
+ DIST_SOURCES = $(FvwmOldDebug_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -202,6 +230,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -276,11 +309,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -369,13 +406,16 @@ FvwmDebug: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ FvwmGtkDebug: $(top_builddir)/config.status $(srcdir)/FvwmGtkDebug.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-FvwmOldDebug$(EXEEXT): $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_DEPENDENCIES)
++FvwmOldDebug$(EXEEXT): $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_DEPENDENCIES) $(EXTRA_FvwmOldDebug_DEPENDENCIES)
+ @rm -f FvwmOldDebug$(EXEEXT)
+ $(LINK) $(FvwmOldDebug_OBJECTS) $(FvwmOldDebug_LDADD) $(LIBS)
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -403,9 +443,7 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -430,11 +468,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -463,9 +508,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -579,10 +622,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmDragWell/Makefile.in
++++ modules/FvwmDragWell/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -64,6 +81,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmDragWell_SOURCES)
+ DIST_SOURCES = $(FvwmDragWell_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -85,6 +107,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -204,6 +232,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -278,11 +311,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -371,8 +408,11 @@ FvwmDragWell.1: $(top_builddir)/config.s
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -406,7 +446,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmDragWell$(EXEEXT): $(FvwmDragWell_OBJECTS) $(FvwmDragWell_DEPENDENCIES)
++FvwmDragWell$(EXEEXT): $(FvwmDragWell_OBJECTS) $(FvwmDragWell_DEPENDENCIES) $(EXTRA_FvwmDragWell_DEPENDENCIES)
+ @rm -f FvwmDragWell$(EXEEXT)
+ $(LINK) $(FvwmDragWell_OBJECTS) $(FvwmDragWell_LDADD) $(LIBS)
+
+@@ -435,11 +475,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -468,9 +515,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -584,10 +629,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmEvent/Makefile.in
++++ modules/FvwmEvent/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmEvent_SOURCES)
+ DIST_SOURCES = $(FvwmEvent_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -367,8 +404,11 @@ FvwmEvent.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-moduleexecPROGRAMS: $(moduleexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduleexecdir)" || $(MKDIR_P) "$(DESTDIR)$(moduleexecdir)"
+ @list='$(moduleexec_PROGRAMS)'; test -n "$(moduleexecdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduleexecdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduleexecdir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -402,7 +442,7 @@ uninstall-moduleexecPROGRAMS:
+
+ clean-moduleexecPROGRAMS:
+ -test -z "$(moduleexec_PROGRAMS)" || rm -f $(moduleexec_PROGRAMS)
+-FvwmEvent$(EXEEXT): $(FvwmEvent_OBJECTS) $(FvwmEvent_DEPENDENCIES)
++FvwmEvent$(EXEEXT): $(FvwmEvent_OBJECTS) $(FvwmEvent_DEPENDENCIES) $(EXTRA_FvwmEvent_DEPENDENCIES)
+ @rm -f FvwmEvent$(EXEEXT)
+ $(LINK) $(FvwmEvent_OBJECTS) $(FvwmEvent_LDADD) $(LIBS)
+
+@@ -429,11 +469,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -462,9 +509,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -578,10 +623,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmForm/FvwmForm-Desktop
++++ modules/FvwmForm/FvwmForm-Desktop 2012-06-30 02:45:59.000000000 +0000
+@@ -3,40 +3,52 @@ DestroyModuleConfig FvwmForm-Desktop: *
+ *FvwmForm-Desktop: Line center
+ *FvwmForm-Desktop: Text "fvwm-menu-desktop options"
+ *FvwmForm-Desktop: Line
++
+ *FvwmForm-Desktop: Line
+-*FvwmForm-Desktop: Text "Icon set:"
++*FvwmForm-Desktop: Text "Use Icons in Menus?:"
+ *FvwmForm-Desktop: Selection SelItype single
+-*FvwmForm-Desktop: Choice TypeFvwm TypeFvwm on "Fvwm"
+-*FvwmForm-Desktop: Choice TypeWm TypeWm off "WM"
+-*FvwmForm-Desktop: Choice TypeDesk TypeDesk off "Desktop"
+-*FvwmForm-Desktop: Choice TypeNone TypeNone off "None"
+-*FvwmForm-Desktop: Line
+-*FvwmForm-Desktop: Text "Title Icon:"
+-*FvwmForm-Desktop: Input TitleIcon 30 ""
+-*FvwmForm-Desktop: Line
+-*FvwmForm-Desktop: Text "Folder Icon:"
+-*FvwmForm-Desktop: Input FolderIcon 30 ""
++*FvwmForm-Desktop: Choice IconsOn IconsOn on "On"
++*FvwmForm-Desktop: Choice IconsOff IconsOff off "Off"
++
+ *FvwmForm-Desktop: Line
+-*FvwmForm-Desktop: Text "App Icon:"
+-*FvwmForm-Desktop: Input AppIcon 30 ""
++*FvwmForm-Desktop: Text "Use Titles in Menus?:"
++*FvwmForm-Desktop: Selection SelItype single
++*FvwmForm-Desktop: Choice TitlesOn TitlesOn on "On"
++*FvwmForm-Desktop: Choice TitlesOff TitlesOff off "Off"
++
++*FvwmForm-Desktop: Line left
++*FvwmForm-Desktop: Text "Menutype:"
++*FvwmForm-Desktop: Input Menutype 16 "applications"
++*FvwmForm-Desktop: Text " (Eg. applications, settings, server-settings)
++
++*FvwmForm-Desktop: Line left
++*FvwmForm-Desktop: Text "Size:"
++*FvwmForm-Desktop: Input Size 3 "24"
++*FvwmForm-Desktop: Text " (Icon size in pixels. Default is 24.)
++
++*FvwmForm-Desktop: Line left
++*FvwmForm-Desktop: Text "Theme:"
++*FvwmForm-Desktop: Input Theme 16 ""
++*FvwmForm-Desktop: Text " (theme name for icon selection)
+
+ *FvwmForm-Desktop: Line expand
+ *FvwmForm-Desktop: Button quit "Set" ^M
+ *FvwmForm-Desktop: Command Piperead 'fvwm-menu-desktop\
+- $(TypeFvwm?--fvwm-icons)\
+- $(TypeWm?--wm-icons)\
+- $(TypeDesk?--desk-icons)\
+- $(TitleIcon?--icon-title $(TitleIcon))\
+- $(FolderIcon?--icon-folder $(FolderIcon))\
+- $(AppIcon?--icon-app $(AppIcon))'
++ $(IconsOn?--enable-mini-icons)\
++ $(TitlesOn?--with-titles)\
++ $(Menutype?--menutype) $(Menutype)\
++ $(Size?-s $(Size))\
++ $(Theme?--theme $(Theme))
++
+ # Before saving the data, remove any previously saved data:
+ *FvwmForm-Desktop: Command DestroyModuleConfig FvwmForm-DesktopDefault: *
+ *FvwmForm-Desktop: Command !( /bin/echo \
+ "# This file last created by FvwmForm-Desktop on: `/bin/date`."; /bin/echo \
+- '*FvwmForm-DesktopDefault: DisableMini $(DisableMini?on) ' ; /bin/echo \
+- '*FvwmForm-DesktopDefault: TypeFvwm $(TypeFvwm?on) ' ; /bin/echo \
+- '*FvwmForm-DesktopDefault: TypeWm $(TypeWm?on) ' ; /bin/echo \
+- '*FvwmForm-DesktopDefault: TypeDesk $(TypeDesk?on) ' ; /bin/echo \
++ '*FvwmForm-DesktopDefault: IconsOn $(IconsOn?on) ' ; /bin/echo \
++ '*FvwmForm-DesktopDefault: IconsOff $(IconsOff?on) ' ; /bin/echo \
++ '*FvwmForm-DesktopDefault: Menutype $(Menutype) ' ; /bin/echo \
++ '*FvwmForm-DesktopDefault: Size $(Size) ' ; /bin/echo \
++ '*FvwmForm-DesktopDefault: Theme $(Theme) ' ; /bin/echo \
+ ) > ${FVWM_USERDIR}/.FvwmForm-Desktop
+ *FvwmForm-Desktop: Button restart "Reset"
+ *FvwmForm-Desktop: Button quit "Cancel" ^[
+--- modules/FvwmForm/FvwmForm.1
++++ modules/FvwmForm/FvwmForm.1 2012-10-11 18:46:35.000000000 +0000
+@@ -224,6 +224,7 @@ Message
+ PadVText
+ Position
+ Selection
++Separator
+ Text
+ Timeout
+ TimeoutFont
+@@ -427,6 +428,12 @@ The selections are mutually exclusive.
+ .TP 16
+ .B \fImultiple\fP
+ This is a multiple-choice selection.
++
++.TP 4
++.B *FvwmForm: Separator
++Draws a 2 pixel shaded line across the form as a visual indication
++of a separate area.
++
+ .TP 4
+ .B *FvwmForm: Choice \fIname\fP \fIvalue\fP "on | off" "\fIstring\fP"
+ Specifies a choice for a proceeding selection.
+--- modules/FvwmForm/FvwmForm.1.in
++++ modules/FvwmForm/FvwmForm.1.in 2012-07-31 04:37:43.000000000 +0000
+@@ -224,6 +224,7 @@ Message
+ PadVText
+ Position
+ Selection
++Separator
+ Text
+ Timeout
+ TimeoutFont
+@@ -427,6 +428,12 @@ The selections are mutually exclusive.
+ .TP 16
+ .B \fImultiple\fP
+ This is a multiple-choice selection.
++
++.TP 4
++.B *FvwmForm: Separator
++Draws a 2 pixel shaded line across the form as a visual indication
++of a separate area.
++
+ .TP 4
+ .B *FvwmForm: Choice \fIname\fP \fIvalue\fP "on | off" "\fIstring\fP"
+ Specifies a choice for a proceeding selection.
+--- modules/FvwmForm/FvwmForm.c
++++ modules/FvwmForm/FvwmForm.c 2012-07-31 04:37:43.000000000 +0000
+@@ -100,6 +100,7 @@ int colorset = -1;
+ int itemcolorset = 0;
+
+ /* prototypes */
++static void RedrawSeparator(Item *item);
+ static void AssignDrawTable(Item *);
+ static void AddItem(void);
+ static void PutDataInForm(char *);
+@@ -211,6 +212,7 @@ static void ct_Geometry(char *);
+ static void ct_Position(char *);
+ static void ct_Read(char *);
+ static void ct_Selection(char *);
++static void ct_Separator(char *);
+ static void ct_Text(char *);
+ static void ct_InputPointer(char *);
+ static void ct_InputPointerBack(char *);
+@@ -257,6 +259,7 @@ static struct CommandTable ct_table[] =
+ {"PadVText",ct_padVText},
+ {"Position",ct_Position},
+ {"Selection",ct_Selection},
++ {"Separator",ct_Separator},
+ {"Text",ct_Text},
+ {"Timeout",ct_Timeout},
+ {"TimeoutFont",ct_TimeoutFont},
+@@ -688,7 +691,6 @@ static void CheckAlloc(Item *this_item,D
+ dt->dt_colors[c_bg] = (colorset < 0)
+ ? GetColor(dt->dt_color_names[c_bg])
+ : Colorset[colorset].bg;
+-
+ xgcv.foreground = dt->dt_colors[c_fg];
+ xgcv.background = dt->dt_colors[c_bg];
+ if (dt->dt_Ffont->font != NULL)
+@@ -750,14 +752,21 @@ static void AssignDrawTable(Item *adt_it
+ match_text_back = color_names[c_bg];
+ match_item_fore = color_names[c_item_fg];
+ match_item_back = color_names[c_item_bg];
+- if (adt_item->type == I_TEXT) {
++
++ switch(adt_item->type) {
++ case I_TEXT:
++ case I_SEPARATOR: /* hack */
+ match_font = font_names[f_text];
+- } else if (adt_item->type == I_TIMEOUT) {
++ break;
++ case I_TIMEOUT:
+ match_font = font_names[f_timeout];
+- } else if (adt_item->type == I_INPUT) {
++ break;
++ case I_INPUT:
+ match_font = font_names[f_input];
+- } else {
++ break;
++ default:
+ match_font = font_names[f_button]; /* choices same as buttons */
++ break;
+ }
+ last_dt = 0;
+ for (find_dt = CF.roots_dt; /* start at front */
+@@ -815,6 +824,17 @@ static void AddItem(void)
+ }
+ }
+
++static void ct_Separator(char *cp)
++{
++ AddItem();
++ item->header.name = ""; /* null = create no variables in form */
++ item->type = I_SEPARATOR;
++ item->header.size_y = 2; /* 2 pixels high */
++ AssignDrawTable(item);
++ AddToLine(item);
++ myfprintf((stderr, "ct_separator command set max width %d\n",(int)item->header.size_x));
++}
++
+ static void ct_Text(char *cp)
+ {
+ /* syntax: *FFText "<text>" */
+@@ -1560,6 +1580,10 @@ void RedrawFrame(XEvent *pev)
+ dt_ptr->dt_Fstr,
+ FWS_HAVE_LENGTH);
+ break;
++ case I_SEPARATOR:
++ myfprintf((stderr, "redraw_frame calling RedrawSeparator\n"));
++ RedrawSeparator(item);
++ break;
+ }
+ if (dt_ptr && dt_ptr->dt_Fstr)
+ {
+@@ -1599,6 +1623,27 @@ void RedrawText(Item *item)
+ return;
+ }
+
++/*
++ * Draw horizontal lines to form a separator
++ *
++ */
++static void RedrawSeparator(Item *item)
++{
++
++ item->header.size_x = CF.max_width - 6;
++ CheckAlloc(item,item->header.dt_ptr); /* alloc colors and fonts needed */
++ if ( item->header.dt_ptr && item->header.dt_ptr->dt_colors[c_itemlo] ) { /* safety */
++ XSetForeground(dpy, item->header.dt_ptr->dt_item_GC,item->header.dt_ptr->dt_colors[c_itemlo]);
++ XDrawLine(dpy, item->header.win,item->header.dt_ptr->dt_item_GC, 0, 0, item->header.size_x, 0);
++ XSetForeground(dpy, item->header.dt_ptr->dt_item_GC,item->header.dt_ptr->dt_colors[c_itemhi]);
++ XDrawLine(dpy, item->header.win,item->header.dt_ptr->dt_item_GC, 0, 1, item->header.size_x, 1);
++
++ } else {
++ fprintf(stderr,"%s: Separators, no colors %8.8X\n",module->name,(int)item->header.dt_ptr);
++ }
++ return;
++}
++
+ void RedrawTimeout(Item *item)
+ {
+ char *p;
+@@ -1674,6 +1719,13 @@ void RedrawItem (Item *item, int click,
+ inter.y = BOX_SPC;
+ inter.width = item->header.size_x - (2 * BOX_SPC) - 2 - TEXT_SPC;
+ inter.height = (item->header.size_y - 1) - 2 * BOX_SPC + 1;
++
++ myfprintf((stderr,"%s: RedrawItem expose x=%d/y=%d h=%d/w=%d\n",module->name,
++ (int)pev->xexpose.x,
++ (int)pev->xexpose.y,
++ (int)pev->xexpose.width,
++ (int)pev->xexpose.height));
++
+ /* This is a slightly altered expose event from ReadXServer. */
+ if (pev)
+ {
+@@ -1933,6 +1985,9 @@ void RedrawItem (Item *item, int click,
+ myfprintf((stderr,"Just put %s into a button\n",
+ item->button.text));
+ break;
++ case I_SEPARATOR:
++ RedrawSeparator(item);
++ break;
+ }
+ if (dt_ptr && dt_ptr->dt_Fstr)
+ {
+@@ -2180,7 +2235,7 @@ static void OpenWindows(void)
+ "going to create window w. bg %s, b/g pixel %X, black pixel %X\n",
+ screen_background_color,
+ (int)xswa.background_pixel,
+- BlackPixel(dpy, screen)));
++ (int)BlackPixel(dpy, screen)));
+ CF.frame = XCreateWindow(dpy, root, x, y, CF.max_width, CF.total_height, 0,
+ Pdepth, InputOutput, Pvisual,
+ CWColormap | CWBackPixel | CWBorderPixel, &xswa);
+@@ -2266,6 +2321,27 @@ static void OpenWindows(void)
+ item->header.dt_ptr->dt_GC, True);
+ }
+ break;
++ case I_SEPARATOR:
++ myfprintf((stderr,"Checking alloc during OpenWindow on separator\n"));
++ CheckAlloc(item,item->header.dt_ptr); /* alloc colors and fonts needed */
++ item->header.size_x = CF.max_width - 6;
++ myfprintf((stderr,"Create win %d/%d %d/%d\n",3,item->header.pos_y,
++ item->header.size_x, 2));
++ item->header.win =
++ XCreateSimpleWindow(dpy, CF.frame,
++ 3, item->header.pos_y,
++ item->header.size_x, 2,
++ 0, CF.screen_background,
++ item->header.dt_ptr->dt_colors[c_bg]);
++ XSelectInput(dpy, item->header.win, ExposureMask);
++ if (itemcolorset >= 0)
++ {
++ SetWindowBackground(dpy, item->header.win,
++ item->header.size_x, 2,
++ &Colorset[(itemcolorset)], Pdepth,
++ item->header.dt_ptr->dt_GC, True);
++ }
++ break;
+ }
+ }
+ Restart();
+@@ -2730,3 +2806,7 @@ ErrorHandler(Display *dpy, XErrorEvent *
+ PrintXErrorAndCoredump(dpy, event, module->name);
+ return 0;
+ }
++/* Local Variables: */
++/* c-basic-offset: 8 */
++/* indent-tabs-mode: t */
++/* End: */
+--- modules/FvwmForm/FvwmForm.h
++++ modules/FvwmForm/FvwmForm.h 2012-07-31 04:37:43.000000000 +0000
+@@ -38,6 +38,7 @@
+ #define I_CHOICE 4
+ #define I_BUTTON 5
+ #define I_TIMEOUT 6
++#define I_SEPARATOR 7
+
+ #define IS_SINGLE 1
+ #define IS_MULTIPLE 2
+@@ -132,6 +133,9 @@ typedef union _item {
+ char *text; /* text string */
+ char *command; /* Fvwm command(s) to execute */
+ } timeout;
++ struct { /* I_SEPARATOR */
++ struct _head head;
++ } separator;
+ } Item;
+
+ #define L_LEFT 1
+--- modules/FvwmForm/Makefile.in
++++ modules/FvwmForm/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -78,6 +95,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ SCRIPTS = $(module_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -89,6 +112,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmForm_SOURCES)
+ DIST_SOURCES = $(FvwmForm_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -209,6 +237,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -283,11 +316,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -400,8 +437,11 @@ FvwmForm.1: $(top_builddir)/config.statu
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -435,13 +475,16 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmForm$(EXEEXT): $(FvwmForm_OBJECTS) $(FvwmForm_DEPENDENCIES)
++FvwmForm$(EXEEXT): $(FvwmForm_OBJECTS) $(FvwmForm_DEPENDENCIES) $(EXTRA_FvwmForm_DEPENDENCIES)
+ @rm -f FvwmForm$(EXEEXT)
+ $(LINK) $(FvwmForm_OBJECTS) $(FvwmForm_LDADD) $(LIBS)
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -469,9 +512,7 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -498,11 +539,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -531,13 +579,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -551,9 +600,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -667,10 +714,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmGtk/Makefile.in
++++ modules/FvwmGtk/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -66,6 +83,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmGtk_SOURCES)
+ DIST_SOURCES = $(FvwmGtk_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -87,6 +109,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ DATA = $(man_one_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -204,6 +232,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -278,11 +311,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -382,8 +419,11 @@ FvwmGtk.1: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -417,7 +457,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmGtk$(EXEEXT): $(FvwmGtk_OBJECTS) $(FvwmGtk_DEPENDENCIES)
++FvwmGtk$(EXEEXT): $(FvwmGtk_OBJECTS) $(FvwmGtk_DEPENDENCIES) $(EXTRA_FvwmGtk_DEPENDENCIES)
+ @rm -f FvwmGtk$(EXEEXT)
+ $(LINK) $(FvwmGtk_OBJECTS) $(FvwmGtk_LDADD) $(LIBS)
+
+@@ -449,8 +489,11 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man_oneDATA: $(man_one_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(man_onedir)" || $(MKDIR_P) "$(DESTDIR)$(man_onedir)"
+ @list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man_onedir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man_onedir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -464,9 +507,7 @@ uninstall-man_oneDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(man_onedir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man_onedir)" && rm -f $$files
++ dir='$(DESTDIR)$(man_onedir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -567,10 +608,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmIconBox/FvwmIconBox.c
++++ modules/FvwmIconBox/FvwmIconBox.c 2012-06-16 13:40:41.000000000 +0000
+@@ -2445,7 +2445,7 @@ void parsekey(char *tline)
+
+ XDisplayKeycodes(dpy, &kmin, &kmax);
+ for (i=kmin; i<=kmax; i++)
+- if (XKeycodeToKeysym(dpy, i, 0) == keysym)
++ if (fvwm_KeycodeToKeysym(dpy, i, 0, 0) == keysym)
+ {
+ k = (struct keyfunc *)safemalloc(sizeof(struct keyfunc));
+ memset(k, 0, sizeof(struct keyfunc));
+@@ -3421,7 +3421,7 @@ void ExecuteKey(XEvent event)
+
+ tmp = KeyActions;
+ event.xkey.keycode =
+- XKeysymToKeycode(dpy,XKeycodeToKeysym(dpy,event.xkey.keycode,0));
++ XKeysymToKeycode(dpy,fvwm_KeycodeToKeysym(dpy,event.xkey.keycode,0,0));
+ while (tmp != NULL){
+ if (tmp->keycode == event.xkey.keycode){
+ MySendFvwmPipe(fd, tmp->action, item->id);
+--- modules/FvwmIconBox/Makefile.in
++++ modules/FvwmIconBox/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmIconBox_SOURCES)
+ DIST_SOURCES = $(FvwmIconBox_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -378,8 +415,11 @@ FvwmIconBox.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -413,7 +453,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmIconBox$(EXEEXT): $(FvwmIconBox_OBJECTS) $(FvwmIconBox_DEPENDENCIES)
++FvwmIconBox$(EXEEXT): $(FvwmIconBox_OBJECTS) $(FvwmIconBox_DEPENDENCIES) $(EXTRA_FvwmIconBox_DEPENDENCIES)
+ @rm -f FvwmIconBox$(EXEEXT)
+ $(LINK) $(FvwmIconBox_OBJECTS) $(FvwmIconBox_LDADD) $(LIBS)
+
+@@ -441,11 +481,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -474,13 +521,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -494,9 +542,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -610,10 +656,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmIconMan/Makefile.in
++++ modules/FvwmIconMan/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -68,6 +85,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmIconMan_SOURCES)
+ DIST_SOURCES = $(FvwmIconMan_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -89,6 +111,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -209,6 +237,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -283,11 +316,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -383,8 +420,11 @@ FvwmIconMan.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -418,7 +458,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmIconMan$(EXEEXT): $(FvwmIconMan_OBJECTS) $(FvwmIconMan_DEPENDENCIES)
++FvwmIconMan$(EXEEXT): $(FvwmIconMan_OBJECTS) $(FvwmIconMan_DEPENDENCIES) $(EXTRA_FvwmIconMan_DEPENDENCIES)
+ @rm -f FvwmIconMan$(EXEEXT)
+ $(LINK) $(FvwmIconMan_OBJECTS) $(FvwmIconMan_LDADD) $(LIBS)
+
+@@ -453,11 +493,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -486,13 +533,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -506,9 +554,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -622,10 +668,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmIconMan/readconfig.c
++++ modules/FvwmIconMan/readconfig.c 2012-06-16 13:40:41.000000000 +0000
+@@ -753,7 +753,7 @@ static Binding *ParseKeyEntry(char *tlin
+
+ XDisplayKeycodes(theDisplay, &min, &max);
+ for (i=min; i<=max; i++) {
+- if (XKeycodeToKeysym(theDisplay, i, 0) == keysym) {
++ if (fvwm_KeycodeToKeysym(theDisplay, i, 0, 0) == keysym) {
+ if (!func) {
+ func = parse_function_list(action);
+ if (!func) {
+--- modules/FvwmIconMan/x.c
++++ modules/FvwmIconMan/x.c 2012-06-16 13:40:41.000000000 +0000
+@@ -245,8 +245,8 @@ void xevent_loop (void)
+ * the cases to one keycode. */
+ theEvent.xkey.keycode =
+ XKeysymToKeycode (theDisplay,
+- XKeycodeToKeysym(theDisplay,
+- theEvent.xkey.keycode,0));
++ fvwm_KeycodeToKeysym(theDisplay,
++ theEvent.xkey.keycode,0,0));
+ modifier = (theEvent.xkey.state & MODS_USED);
+ ConsoleDebug (X11, "\tKeyPress: %d\n", theEvent.xkey.keycode);
+
+--- modules/FvwmIdent/Makefile.in
++++ modules/FvwmIdent/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmIdent_SOURCES)
+ DIST_SOURCES = $(FvwmIdent_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -377,8 +414,11 @@ FvwmIdent.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -412,7 +452,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmIdent$(EXEEXT): $(FvwmIdent_OBJECTS) $(FvwmIdent_DEPENDENCIES)
++FvwmIdent$(EXEEXT): $(FvwmIdent_OBJECTS) $(FvwmIdent_DEPENDENCIES) $(EXTRA_FvwmIdent_DEPENDENCIES)
+ @rm -f FvwmIdent$(EXEEXT)
+ $(LINK) $(FvwmIdent_OBJECTS) $(FvwmIdent_LDADD) $(LIBS)
+
+@@ -439,11 +479,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -472,13 +519,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -492,9 +540,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -608,10 +654,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmM4/Makefile.in
++++ modules/FvwmM4/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmM4_SOURCES)
+ DIST_SOURCES = $(FvwmM4_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -370,8 +407,11 @@ FvwmM4.1: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -405,7 +445,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmM4$(EXEEXT): $(FvwmM4_OBJECTS) $(FvwmM4_DEPENDENCIES)
++FvwmM4$(EXEEXT): $(FvwmM4_OBJECTS) $(FvwmM4_DEPENDENCIES) $(EXTRA_FvwmM4_DEPENDENCIES)
+ @rm -f FvwmM4$(EXEEXT)
+ $(LINK) $(FvwmM4_OBJECTS) $(FvwmM4_LDADD) $(LIBS)
+
+@@ -432,11 +472,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -465,9 +512,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -581,10 +626,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmPager/Makefile.in
++++ modules/FvwmPager/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmPager_SOURCES)
+ DIST_SOURCES = $(FvwmPager_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -378,8 +415,11 @@ FvwmPager.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -413,7 +453,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmPager$(EXEEXT): $(FvwmPager_OBJECTS) $(FvwmPager_DEPENDENCIES)
++FvwmPager$(EXEEXT): $(FvwmPager_OBJECTS) $(FvwmPager_DEPENDENCIES) $(EXTRA_FvwmPager_DEPENDENCIES)
+ @rm -f FvwmPager$(EXEEXT)
+ $(LINK) $(FvwmPager_OBJECTS) $(FvwmPager_LDADD) $(LIBS)
+
+@@ -441,11 +481,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -474,13 +521,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -494,9 +542,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -610,10 +656,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmPerl/Makefile.in
++++ modules/FvwmPerl/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -67,10 +84,21 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"
+ SCRIPTS = $(module_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -188,6 +216,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -262,11 +295,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -346,8 +383,11 @@ FvwmPerl: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -375,16 +415,21 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -413,9 +458,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -483,10 +526,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmProxy/Makefile.in
++++ modules/FvwmProxy/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmProxy_SOURCES)
+ DIST_SOURCES = $(FvwmProxy_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -378,8 +415,11 @@ FvwmProxy.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -413,7 +453,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmProxy$(EXEEXT): $(FvwmProxy_OBJECTS) $(FvwmProxy_DEPENDENCIES)
++FvwmProxy$(EXEEXT): $(FvwmProxy_OBJECTS) $(FvwmProxy_DEPENDENCIES) $(EXTRA_FvwmProxy_DEPENDENCIES)
+ @rm -f FvwmProxy$(EXEEXT)
+ $(LINK) $(FvwmProxy_OBJECTS) $(FvwmProxy_LDADD) $(LIBS)
+
+@@ -440,11 +480,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -473,13 +520,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -493,9 +541,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -609,10 +655,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmRearrange/Makefile.in
++++ modules/FvwmRearrange/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -76,6 +93,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ SCRIPTS = $(module_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -87,6 +110,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmRearrange_SOURCES)
+ DIST_SOURCES = $(FvwmRearrange_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -372,8 +409,11 @@ FvwmRearrange.1: $(top_builddir)/config.
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -407,13 +447,16 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmRearrange$(EXEEXT): $(FvwmRearrange_OBJECTS) $(FvwmRearrange_DEPENDENCIES)
++FvwmRearrange$(EXEEXT): $(FvwmRearrange_OBJECTS) $(FvwmRearrange_DEPENDENCIES) $(EXTRA_FvwmRearrange_DEPENDENCIES)
+ @rm -f FvwmRearrange$(EXEEXT)
+ $(LINK) $(FvwmRearrange_OBJECTS) $(FvwmRearrange_LDADD) $(LIBS)
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -441,9 +484,7 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -468,11 +509,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -501,9 +549,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -617,10 +663,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmSave/Makefile.in
++++ modules/FvwmSave/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmSave_SOURCES)
+ DIST_SOURCES = $(FvwmSave_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -367,8 +404,11 @@ FvwmSave.1: $(top_builddir)/config.statu
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -402,7 +442,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmSave$(EXEEXT): $(FvwmSave_OBJECTS) $(FvwmSave_DEPENDENCIES)
++FvwmSave$(EXEEXT): $(FvwmSave_OBJECTS) $(FvwmSave_DEPENDENCIES) $(EXTRA_FvwmSave_DEPENDENCIES)
+ @rm -f FvwmSave$(EXEEXT)
+ $(LINK) $(FvwmSave_OBJECTS) $(FvwmSave_LDADD) $(LIBS)
+
+@@ -429,11 +469,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -462,9 +509,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -578,10 +623,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmSaveDesk/Makefile.in
++++ modules/FvwmSaveDesk/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmSaveDesk_SOURCES)
+ DIST_SOURCES = $(FvwmSaveDesk_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -367,8 +404,11 @@ FvwmSaveDesk.1: $(top_builddir)/config.s
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -402,7 +442,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmSaveDesk$(EXEEXT): $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_DEPENDENCIES)
++FvwmSaveDesk$(EXEEXT): $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_DEPENDENCIES) $(EXTRA_FvwmSaveDesk_DEPENDENCIES)
+ @rm -f FvwmSaveDesk$(EXEEXT)
+ $(LINK) $(FvwmSaveDesk_OBJECTS) $(FvwmSaveDesk_LDADD) $(LIBS)
+
+@@ -429,11 +469,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -462,9 +509,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -578,10 +623,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmScript/FvwmScript.c
++++ modules/FvwmScript/FvwmScript.c 2012-06-16 13:40:41.000000000 +0000
+@@ -973,7 +973,7 @@ void ReadXServer (void)
+ find = False;
+ XLookupString(&event.xkey, (char *)buf, sizeof(buf), &ks, NULL);
+ event.xkey.keycode =
+- XKeysymToKeycode(dpy,XKeycodeToKeysym(dpy,event.xkey.keycode,0));
++ XKeysymToKeycode(dpy,fvwm_KeycodeToKeysym(dpy,event.xkey.keycode,0,0));
+
+ /* check for bindings defined by the Key instruction */
+ tmp.res_class = tmp.res_name = "root";
+@@ -1452,7 +1452,7 @@ int main (int argc, char **argv)
+ /* Compute the Shift-Tab keysym */
+ {
+ KeyCode tab = XKeysymToKeycode(dpy, XK_Tab);
+- shift_tab_ks = XKeycodeToKeysym(dpy, tab, ShiftMask);
++ shift_tab_ks = fvwm_KeycodeToKeysym(dpy, tab, ShiftMask, 0);
+ }
+
+ /* Construction des boutons et de la fenetre */
+--- modules/FvwmScript/Makefile.in
++++ modules/FvwmScript/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -71,6 +88,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -92,6 +114,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -242,6 +270,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -316,11 +349,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -423,8 +460,11 @@ FvwmScript.1: $(top_builddir)/config.sta
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -458,7 +498,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmScript$(EXEEXT): $(FvwmScript_OBJECTS) $(FvwmScript_DEPENDENCIES)
++FvwmScript$(EXEEXT): $(FvwmScript_OBJECTS) $(FvwmScript_DEPENDENCIES) $(EXTRA_FvwmScript_DEPENDENCIES)
+ @rm -f FvwmScript$(EXEEXT)
+ $(LINK) $(FvwmScript_OBJECTS) $(FvwmScript_LDADD) $(LIBS)
+
+@@ -489,11 +529,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -522,9 +569,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -706,13 +751,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -750,10 +792,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmScript/Scripts/Makefile.in
++++ modules/FvwmScript/Scripts/Makefile.in 2012-10-11 18:46:21.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -350,8 +387,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -365,9 +405,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -422,10 +460,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmScript/Widgets/Makefile.in
++++ modules/FvwmScript/Widgets/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -67,6 +84,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libWidgets_a_SOURCES)
+ DIST_SOURCES = $(libWidgets_a_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -183,6 +205,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -257,11 +284,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -344,7 +375,7 @@ $(am__aclocal_m4_deps):
+
+ clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libWidgets.a: $(libWidgets_a_OBJECTS) $(libWidgets_a_DEPENDENCIES)
++libWidgets.a: $(libWidgets_a_OBJECTS) $(libWidgets_a_DEPENDENCIES) $(EXTRA_libWidgets_a_DEPENDENCIES)
+ -rm -f libWidgets.a
+ $(libWidgets_a_AR) libWidgets.a $(libWidgets_a_OBJECTS) $(libWidgets_a_LIBADD)
+ $(RANLIB) libWidgets.a
+@@ -483,10 +514,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmScroll/Makefile.in
++++ modules/FvwmScroll/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -65,6 +82,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmScroll_SOURCES)
+ DIST_SOURCES = $(FvwmScroll_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -86,6 +108,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -206,6 +234,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -280,11 +313,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -375,8 +412,11 @@ FvwmScroll.1: $(top_builddir)/config.sta
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -410,7 +450,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmScroll$(EXEEXT): $(FvwmScroll_OBJECTS) $(FvwmScroll_DEPENDENCIES)
++FvwmScroll$(EXEEXT): $(FvwmScroll_OBJECTS) $(FvwmScroll_DEPENDENCIES) $(EXTRA_FvwmScroll_DEPENDENCIES)
+ @rm -f FvwmScroll$(EXEEXT)
+ $(LINK) $(FvwmScroll_OBJECTS) $(FvwmScroll_LDADD) $(LIBS)
+
+@@ -438,11 +478,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -471,13 +518,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -491,9 +539,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -607,10 +653,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmTabs/Makefile.in
++++ modules/FvwmTabs/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -68,11 +85,22 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(configdir)"
+ SCRIPTS = $(module_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -191,6 +219,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -265,11 +298,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -352,8 +389,11 @@ FvwmTabs: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -381,16 +421,21 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -419,13 +464,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -439,9 +485,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -509,10 +553,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmTaskBar/Makefile.in
++++ modules/FvwmTaskBar/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -67,6 +84,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmTaskBar_SOURCES)
+ DIST_SOURCES = $(FvwmTaskBar_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -88,6 +110,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -208,6 +236,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -282,11 +315,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -387,8 +424,11 @@ FvwmTaskBar.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -422,7 +462,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmTaskBar$(EXEEXT): $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_DEPENDENCIES)
++FvwmTaskBar$(EXEEXT): $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_DEPENDENCIES) $(EXTRA_FvwmTaskBar_DEPENDENCIES)
+ @rm -f FvwmTaskBar$(EXEEXT)
+ $(LINK) $(FvwmTaskBar_OBJECTS) $(FvwmTaskBar_LDADD) $(LIBS)
+
+@@ -454,11 +494,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -487,13 +534,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -507,9 +555,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -623,10 +669,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmTheme/Makefile.in
++++ modules/FvwmTheme/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmTheme_SOURCES)
+ DIST_SOURCES = $(FvwmTheme_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -84,6 +106,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -203,6 +231,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -277,11 +310,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -367,8 +404,11 @@ FvwmTheme.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -402,7 +442,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmTheme$(EXEEXT): $(FvwmTheme_OBJECTS) $(FvwmTheme_DEPENDENCIES)
++FvwmTheme$(EXEEXT): $(FvwmTheme_OBJECTS) $(FvwmTheme_DEPENDENCIES) $(EXTRA_FvwmTheme_DEPENDENCIES)
+ @rm -f FvwmTheme$(EXEEXT)
+ $(LINK) $(FvwmTheme_OBJECTS) $(FvwmTheme_LDADD) $(LIBS)
+
+@@ -429,11 +469,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -462,9 +509,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -578,10 +623,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmWharf/Makefile.in
++++ modules/FvwmWharf/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -64,6 +81,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmWharf_SOURCES)
+ DIST_SOURCES = $(FvwmWharf_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -85,6 +107,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -204,6 +232,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -278,11 +311,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -374,8 +411,11 @@ FvwmWharf.1: $(top_builddir)/config.stat
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -409,7 +449,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmWharf$(EXEEXT): $(FvwmWharf_OBJECTS) $(FvwmWharf_DEPENDENCIES)
++FvwmWharf$(EXEEXT): $(FvwmWharf_OBJECTS) $(FvwmWharf_DEPENDENCIES) $(EXTRA_FvwmWharf_DEPENDENCIES)
+ @rm -f FvwmWharf$(EXEEXT)
+ $(LINK) $(FvwmWharf_OBJECTS) $(FvwmWharf_LDADD) $(LIBS)
+
+@@ -438,11 +478,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -471,9 +518,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -587,10 +632,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmWinList/Makefile.in
++++ modules/FvwmWinList/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -66,6 +83,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(FvwmWinList_SOURCES)
+ DIST_SOURCES = $(FvwmWinList_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -87,6 +109,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -207,6 +235,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -281,11 +314,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -381,8 +418,11 @@ FvwmWinList.1: $(top_builddir)/config.st
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-modulePROGRAMS: $(module_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_PROGRAMS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+@@ -416,7 +456,7 @@ uninstall-modulePROGRAMS:
+
+ clean-modulePROGRAMS:
+ -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
+-FvwmWinList$(EXEEXT): $(FvwmWinList_OBJECTS) $(FvwmWinList_DEPENDENCIES)
++FvwmWinList$(EXEEXT): $(FvwmWinList_OBJECTS) $(FvwmWinList_DEPENDENCIES) $(EXTRA_FvwmWinList_DEPENDENCIES)
+ @rm -f FvwmWinList$(EXEEXT)
+ $(LINK) $(FvwmWinList_OBJECTS) $(FvwmWinList_LDADD) $(LIBS)
+
+@@ -446,11 +486,18 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -479,13 +526,14 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -499,9 +547,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -615,10 +661,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/FvwmWindowMenu/Makefile.in
++++ modules/FvwmWindowMenu/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -67,10 +84,21 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(man1dir)"
+ SCRIPTS = $(module_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -188,6 +216,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -262,11 +295,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -346,8 +383,11 @@ FvwmWindowMenu: $(top_builddir)/config.s
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -375,16 +415,21 @@ uninstall-moduleSCRIPTS:
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(moduledir)" && rm -f $$files
++ dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
+ install-man1: $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+- @list=''; test -n "$(man1dir)" || exit 0; \
+- { for i in $$list; do echo "$$i"; done; \
+- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+- sed -n '/\.1[a-z]*$$/p'; \
++ @list1=''; \
++ list2='$(man_MANS)'; \
++ test -n "$(man1dir)" \
++ && test -n "`echo $$list1$$list2`" \
++ || exit 0; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++ { for i in $$list1; do echo "$$i"; done; \
++ if test -n "$$list2"; then \
++ for i in $$list2; do echo "$$i"; done \
++ | sed -n '/\.1[a-z]*$$/p'; \
++ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+@@ -413,9 +458,7 @@ uninstall-man1:
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -483,10 +526,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- modules/Makefile.in
++++ modules/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,6 +70,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -200,6 +222,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -274,11 +301,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -526,13 +557,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -567,10 +595,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- perllib/FVWM/Makefile.in
++++ perllib/FVWM/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -55,6 +72,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -76,6 +98,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+@@ -225,6 +253,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -299,11 +332,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -386,8 +423,11 @@ Module.pm: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -401,9 +441,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -572,13 +610,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -616,10 +651,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- perllib/FVWM/Module/Makefile.in
++++ perllib/FVWM/Module/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -339,8 +376,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -354,9 +394,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -411,10 +449,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- perllib/FVWM/Tracker/Makefile.in
++++ perllib/FVWM/Tracker/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -342,8 +379,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -357,9 +397,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -414,10 +452,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- perllib/General/Makefile.in
++++ perllib/General/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -339,8 +376,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -354,9 +394,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -411,10 +449,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- perllib/Makefile.in
++++ perllib/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,6 +70,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -200,6 +222,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -274,11 +301,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -519,13 +550,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -560,10 +588,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- po/ChangeLog
++++ po/ChangeLog 2012-08-24 03:17:43.000000000 +0000
+@@ -1,3 +1,7 @@
++2012-08-23 Dan Espen <despen@verizon.net>
++
++ * fvwm.pot: Combine "Restart fvwm" lines to remove duplicate.
++
+ 2011-10-15 Thomas Adam <thomas@fvwm.org>
+ * FvwmTaskBar.zh_TW.po:
+ * FvwmScript.zh_TW.po:
+--- po/Makefile.in
++++ po/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -161,6 +183,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -235,11 +262,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -399,10 +430,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+Files fvwm-2.6.5//po/fvwm.ar.gmo and fvwm-snap-20121011//po/fvwm.ar.gmo differ
+--- po/fvwm.ar.po
++++ po/fvwm.ar.po 2012-08-24 03:17:43.000000000 +0000
+@@ -10,6 +10,7 @@ msgstr ""
+ "PO-Revision-Date: 2002-12-06 08:25+0100\n"
+ "Last-Translator: Nadim Shaikli <shaikli@yahoo.com>\n"
+ "Language-Team: Arabic\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -31,7 +32,7 @@ msgstr "ملف إعداد 95"
+ msgid "Issue fvwm commands"
+ msgstr "أصدر أوامر fvwm"
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr "أعد تشغيل fvwm"
+
+Files fvwm-2.6.5//po/fvwm.de.gmo and fvwm-snap-20121011//po/fvwm.de.gmo differ
+--- po/fvwm.de.po
++++ po/fvwm.de.po 2012-08-24 03:17:43.000000000 +0000
+@@ -10,6 +10,7 @@ msgstr ""
+ "PO-Revision-Date: 2002-11-23 06:00+0100\n"
+ "Last-Translator: Andrei Mitrofanow <smilebef@web.de>\n"
+ "Language-Team: German\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-15\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -31,7 +32,7 @@ msgstr "Konfiguration mit Script95"
+ msgid "Issue fvwm commands"
+ msgstr "Fvwm-Konsole"
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr "Fvwm neu starten"
+
+Files fvwm-2.6.5//po/fvwm.fr.gmo and fvwm-snap-20121011//po/fvwm.fr.gmo differ
+--- po/fvwm.fr.po
++++ po/fvwm.fr.po 2012-08-24 03:17:43.000000000 +0000
+@@ -11,6 +11,7 @@ msgstr ""
+ "PO-Revision-Date: 2002-11-23 06:00+0100\n"
+ "Last-Translator: Olivier Chapuis <olivier.chapuis@free.fr>\n"
+ "Language-Team: French\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-15\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -32,7 +33,7 @@ msgstr "Configuration avec Script95"
+ msgid "Issue fvwm commands"
+ msgstr "Executer des commandes fvwm"
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr "Red�marrer fvwm"
+
+--- po/fvwm.pot
++++ po/fvwm.pot 2012-08-24 03:17:43.000000000 +0000
+@@ -31,7 +31,7 @@ msgstr ""
+ msgid "Issue fvwm commands"
+ msgstr ""
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr ""
+
+@@ -316,7 +316,3 @@ msgstr ""
+ #. ./modules/FvwmForm/FvwmForm-Setup.in: line 55
+ msgid "Copy Config File(s)"
+ msgstr ""
+-
+-#. ./modules/FvwmForm/FvwmForm-Setup.in: line 66
+-msgid "Restart fvwm"
+-msgstr ""
+Files fvwm-2.6.5//po/fvwm.sv_SE.gmo and fvwm-snap-20121011//po/fvwm.sv_SE.gmo differ
+--- po/fvwm.sv_SE.po
++++ po/fvwm.sv_SE.po 2012-08-24 03:17:43.000000000 +0000
+@@ -11,6 +11,7 @@ msgstr ""
+ "PO-Revision-Date: 2003-10-19 15:01+0200\n"
+ "Last-Translator: Johan Svedberg <johan@svedberg.pp.se>\n"
+ "Language-Team: Swedish\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -32,7 +33,7 @@ msgstr "St�ll in 95 skript"
+ msgid "Issue fvwm commands"
+ msgstr "Utf�r fvwm-kommandon"
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr "Starta om fvwm"
+
+Files fvwm-2.6.5//po/fvwm.zh_CN.gmo and fvwm-snap-20121011//po/fvwm.zh_CN.gmo differ
+--- po/fvwm.zh_CN.po
++++ po/fvwm.zh_CN.po 2012-08-24 03:17:43.000000000 +0000
+@@ -10,6 +10,7 @@ msgstr ""
+ "PO-Revision-Date: 2004-05-22 16:12+0800\n"
+ "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
+ "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -30,7 +31,7 @@ msgstr "设置 95 脚本"
+ msgid "Issue fvwm commands"
+ msgstr "执行 fvwm 命令"
+
+-#: ../fvwm/fvwm.c:1374
++#: ../fvwm/fvwm.c:1374 ../modules/FvwmForm/FvwmForm-Setup.in: line 66
+ msgid "Restart fvwm"
+ msgstr "重新启动 fvwm"
+
+--- rpm/Makefile.in
++++ rpm/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES = fvwm.spec
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -161,6 +183,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -235,11 +262,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -369,10 +400,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- rpm/fvwm.spec
++++ rpm/fvwm.spec 2012-10-11 18:46:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ #%define prefix %{_prefix}
+ %define prefix /usr
+
+-%define ver 2.6.5
++%define ver 2.6.6
+ %define rel 1
+ %define c_p --without-gnome --without-rplay-library --sysconfdir=/etc
+ %define m_p CFLAGS="-O2"
+--- sample.fvwmrc/Makefile.in
++++ sample.fvwmrc/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -47,6 +64,11 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -68,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(configdir)"
+ DATA = $(config_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -184,6 +212,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -258,11 +291,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -342,8 +379,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-configDATA: $(config_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
++ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+@@ -357,9 +397,7 @@ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(configdir)" && rm -f $$files
++ dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -414,10 +452,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- tests/Makefile.in
++++ tests/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,6 +70,11 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -200,6 +222,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -274,11 +301,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -520,13 +551,10 @@ distdir: $(DISTFILES)
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+@@ -561,10 +589,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- tests/hints/Makefile.in
++++ tests/hints/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,23 @@
+ @SET_MAKE@
+
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -63,6 +80,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = hints_test.c
+ DIST_SOURCES = hints_test.c
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -179,6 +201,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -253,11 +280,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -337,7 +368,7 @@ $(am__aclocal_m4_deps):
+
+ clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+-hints_test$(EXEEXT): $(hints_test_OBJECTS) $(hints_test_DEPENDENCIES)
++hints_test$(EXEEXT): $(hints_test_OBJECTS) $(hints_test_DEPENDENCIES) $(EXTRA_hints_test_DEPENDENCIES)
+ @rm -f hints_test$(EXEEXT)
+ $(LINK) $(hints_test_OBJECTS) $(hints_test_LDADD) $(LIBS)
+
+@@ -459,10 +490,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+--- utils/Makefile.in
++++ utils/Makefile.in 2012-10-11 18:46:22.000000000 +0000
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,23 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -62,6 +79,11 @@ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = xselection.c
+ DIST_SOURCES = xselection.c
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -178,6 +200,11 @@ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
++PYTHON = @PYTHON@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
+ RELDATELONG = @RELDATELONG@
+ RELDATENUM = @RELDATENUM@
+@@ -252,11 +279,15 @@ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
+ png_CFLAGS = @png_CFLAGS@
+ png_LIBS = @png_LIBS@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
+ readline_CFLAGS = @readline_CFLAGS@
+ readline_LIBS = @readline_LIBS@
+ rplay_CFLAGS = @rplay_CFLAGS@
+@@ -336,7 +367,7 @@ $(top_srcdir)/configure: $(am__configur
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+-xselection$(EXEEXT): $(xselection_OBJECTS) $(xselection_DEPENDENCIES)
++xselection$(EXEEXT): $(xselection_OBJECTS) $(xselection_DEPENDENCIES) $(EXTRA_xselection_DEPENDENCIES)
+ @rm -f xselection$(EXEEXT)
+ $(LINK) $(xselection_OBJECTS) $(xselection_LDADD) $(LIBS)
+
+@@ -458,10 +489,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
++ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/fvwm2.changes b/fvwm2.changes
index 5399df7..b30a571 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Thu Jul 18 11:58:36 UTC 2013 - werner@suse.de
+
+- Update to 2.6.5 + snpashot 2012/10/11
+ - NEWS: Added FvwmForm Separators,
+ fvwm-desktop-menu fixes.
+ - libs/Bindings.c (AddBinding):
+ - fvwm/builtins.c (FkeysymToKeycode):
+ - fvwm/events.c (__handle_key):
+ Add detection of XKeycodeToKeysym as deprecated, and provide a wrapper
+ for it by way of fvwm_KeycodeToKeysym() to call the newer
+ XkbKeycodeToKeysum() where needed.
+ - libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
+ PImageLoadPng):
+ Fix compilation errors.
+ - fvwm/menu.c ( __scan_for_pixmap):
+ - libs/PictureImageLoader.c (PImageLoadSvg, PimageLoadXpm,
+ PImageLoadPng):
+ Add fvwm_msg() for hints about failed image load.
+ - fvwm/events.c (HandlePropertyNotify):
+ Fix XSizeHints problem with FVWM not correctly allowing resizing of
+ windows when the hints are toggled with respect to FVWM processing
+ XA_WM_NORMAL_HINTS.
+ - fvwm/placement.c ( __pl_position_get_pos_simple):
+ When using "UnderMouse" for PositionPlacement, ensure we honor the EWMH
+ working area by default if it's in use.
+ - fvwm/fvwm.c (InstallSignals):
+ Unblock signals when installing them.
+ When signals are registered, ensure they're unblocked so as not to queue
+ them up.
+ - fvwm/infostore.c (get_metainfo_length):
+ + fvwm/infostore.c (new_metainfo):
+ + fvwm/infostore.c (insert_metainfo):
+ + fvwm/style.c (style_parse_one_style_option):
+ Make C90 compliant.
+- Add patch fvwm-snapshot.patch for snpashot 2012/10/11
+- Add patch fvwm-rsvg.patch to avoid internal rsvg-cairo.h included twice
+- Add source bin/fvwm-menu-desktop-config.fpl as missed in 2012/10/11
+- Modify patch fvwm-2.5.26-gcc-warnings.patch as fixed upstream
+
-------------------------------------------------------------------
Sat Mar 30 18:05:26 CET 2013 - werner@suse.de
diff --git a/fvwm2.spec b/fvwm2.spec
index fb1339b..f7fb09c 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,7 +1,7 @@
#
# spec file for package fvwm2
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-
Name: fvwm2
BuildRequires: automake
BuildRequires: freetype2-devel
@@ -30,9 +29,13 @@ BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
-Provides: fvwm fvwmicns windowmanager xpmroot
-Obsoletes: fvwm xpmroot
-Version: 2.6.4
+Provides: fvwm
+Provides: fvwmicns
+Provides: windowmanager
+Provides: xpmroot
+Obsoletes: fvwm
+Obsoletes: xpmroot
+Version: 2.6.5
Release: 0
Summary: Improved Version of FVWM Window Manager
License: GPL-2.0+
@@ -44,14 +47,23 @@ Source3: %name.desktop
Source4: system.fvwm2rc
Source5: _system.fvwm2rc
Source6: openSuSE.xpm
+#SOURCE-FIX-OPENSUSE for snapshot 2012/10/11
+Source7: fvwm-menu-desktop-config.fpl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: xdg-menu, desktop-data, mktemp, xli
+Requires: desktop-data
+Requires: mktemp
+Requires: xdg-menu
+Requires: xli
Patch0: fvwm-configure.patch
Patch1: fvwm-2.5.26-gcc-warnings.patch
Patch2: fvwm-2.5.26-ia64.patch
Patch3: fvwm-2.5.26-sv_SE.patch
Patch5: fvwm-2.5.26-charset_in_title.patch
Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch
+#PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
+Patch8: fvwm-rsvg.patch
+#PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11
+Patch42: fvwm-snapshot.patch
%description
FVWM is a virtual desktop window manager for the X Window System.
@@ -69,16 +81,19 @@ compatible with the Motif MWM.
%prep
%setup -q -n fvwm-%{version}
+%patch42
%patch0
%patch1
%patch2
%patch3
%patch5
%patch7 -p1
+%patch8
find . -name *sv_SE* |xargs rename sv_SE sv
mkdir icons
tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
cp %{S:6} icons
+cp %{S:7} bin/
#
# build