Fix rpm target and some distcheck stuff. distcheck still fails

(Old svn revision: 11093)
author: Jasper Huijsmans <jbhuijsmans@home.nl> 2003-05-04 18:21:05 +0000
committer: Jasper Huijsmans <jbhuijsmans@home.nl> 2003-05-04 18:21:05 +0000
commit: 69dba2aea955b794232c96bb957cf416f3eef73b (patch)
tree: a119521d4759d17a8958d49adeaa9aad26c928c4
parent: 2a0827d882629ea33a678f5013fa2ea653a5c5e2 (diff)
download: xfwm4-69dba2aea955b794232c96bb957cf416f3eef73b.tar.gz
96 files changed, 465 insertions, 460 deletions
diff --git a/Makefile.am b/Makefile.am
index 4f36a6493..2dedca32a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,15 +2,15 @@
 
 noinst_DATA = example.xfwm4rc
 
-EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec.in
+EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec
 
 SUBDIRS = po src mcs-plugin defaults themes
 
 distclean-local:
 	rm -rf example.xfwm4rc xfwm4.spec *.cache
 
-example.xfwm4rc:
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" example.xfwm4rc.in > example.xfwm4rc
+example.xfwm4rc: Makefile example.xfwm4rc.in
+	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/example.xfwm4rc.in > example.xfwm4rc
 
 rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/Makefile.in b/Makefile.in
index d3dedd63c..72208c61e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -166,7 +166,7 @@ target_alias = @target_alias@
 
 noinst_DATA = example.xfwm4rc
 
-EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec.in
+EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec
 
 SUBDIRS = po src mcs-plugin defaults themes
 
@@ -321,9 +321,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -467,7 +473,7 @@ distcheck: dist
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
 distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -476,11 +482,11 @@ distuninstallcheck:
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
@@ -586,8 +592,8 @@ uninstall-info: uninstall-info-recursive
 distclean-local:
 	rm -rf example.xfwm4rc xfwm4.spec *.cache
 
-example.xfwm4rc:
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" example.xfwm4rc.in > example.xfwm4rc
+example.xfwm4rc: Makefile example.xfwm4rc.in
+	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/example.xfwm4rc.in > example.xfwm4rc
 
 rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/aclocal.m4 b/aclocal.m4
index a3284af1b..8203ca636 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.4 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -16,7 +16,7 @@
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 9
-
-# 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,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
 
 AC_PREREQ([2.54])
 
@@ -170,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.3])])
+	 [AM_AUTOMAKE_VERSION([1.7.4])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -889,6 +882,33 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
+
 
 # serial 46 AC_PROG_LIBTOOL
 AC_DEFUN([AC_PROG_LIBTOOL],
diff --git a/config.guess b/config.guess
index 4fc21ecc3..cc726cd15 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-01-30'
+timestamp='2003-02-22'
 
 # 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
@@ -235,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    *:MicroBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
-	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
diff --git a/config.sub b/config.sub
index 5f94062aa..9772e87d2 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-02-03'
+timestamp='2003-02-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1128,7 +1128,7 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -microbsd*)
+	      | -powermax* | -dnix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/configure b/configure
index 24a22f6e0..577bce1ac 100755
--- a/configure
+++ b/configure
@@ -3027,13 +3027,14 @@ fi
 rm -f conftest*
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
+
+        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -3069,69 +3070,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
+  ac_cv_lib_cposix_strerror=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_lib_cposix_strerror=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
+LIBS=$ac_check_lib_save_LIBS
 fi
-LIBS=$ac_func_search_save_LIBS
+echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
+if test $ac_cv_lib_cposix_strerror = yes; then
+  LIBS="$LIBS -lcposix"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-fi
+
 
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -5124,7 +5079,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5127 "configure"' > conftest.$ac_ext
+  echo '#line 5082 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
diff --git a/defaults/Makefile.am b/defaults/Makefile.am
index 4db1fbcf4..995775d65 100644
--- a/defaults/Makefile.am
+++ b/defaults/Makefile.am
@@ -4,5 +4,6 @@ EXTRA_DIST = defaults.in
 
 distclean-local:
 	rm -f defaults
-defaults :
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" defaults.in > defaults
+	
+defaults : Makefile defaults.in
+	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/defaults.in > defaults
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index 1b091abdc..9f8534010 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -167,6 +167,7 @@ defaultsdir = $(pkgdatadir)
 defaults_DATA = defaults
 EXTRA_DIST = defaults.in
 subdir = defaults
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -337,8 +338,9 @@ uninstall-am: uninstall-defaultsDATA uninstall-info-am
 
 distclean-local:
 	rm -f defaults
-defaults :
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" defaults.in > defaults
+
+defaults : Makefile defaults.in
+	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/defaults.in > defaults
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 570aa4541..d9bbae954 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -173,13 +173,23 @@ EOF
       $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
     ;;
 
+  darwin* | rhapsody*)
+    allow_undefined_flag='-undefined suppress'
+    archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
+    # We need to add '_' to the symbols in $export_symbols first
+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load $convenience'
+    ;;
+
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
       wlarc=
     else
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
     fi
     ;;
 
@@ -369,23 +379,6 @@ else
     fix_srcfile_path='`cygpath -w "$srcfile"`'
     ;;
 
-  darwin* | rhapsody*)
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring'
-    # We need to add '_' to the symbols in $export_symbols first
-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
-    ;;
-
   freebsd1*)
     ld_shlibs=no
     ;;
@@ -651,7 +644,7 @@ else
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      ac_cv_prog_cc_pic='-fno-common'
+      lt_cv_prog_cc_pic='-fno-common'
       ;;
     *djgpp*)
       # DJGPP does not support shared libraries at all
diff --git a/ltconfig b/ltconfig
index 91907462a..1eb4072f9 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1104,7 +1104,7 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
+  library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
   soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
@@ -1116,17 +1116,16 @@ freebsd1*)
 
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=sunos
-  case $objformat in
-    elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-      soname_spec='${libname}${release}.so$major'
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
       need_version=no
       need_lc=no
       need_lib_prefix=no
       ;;
-    *)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+    freebsd-*)
+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
       need_version=yes
       ;;
   esac
@@ -1168,7 +1167,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 irix5* | irix6*)
-  version_type=sunos
+  version_type=irix
   need_lib_prefix=no
   need_version=no
   soname_spec='${libname}${release}.so$major'
@@ -1199,7 +1198,7 @@ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1237,8 +1236,6 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  sys_lib_search_path_spec="/usr/lib"
   ;;
 
 newsos6)
@@ -1285,7 +1282,7 @@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1430,11 +1427,11 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  echo "$progname:1433: checking if global_symbol_pipe works" >&5
-  if { (eval echo $progname:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
+  echo "$progname:1430: checking if global_symbol_pipe works" >&5
+  if { (eval echo $progname:1431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { echo "$progname:1437: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+    if { echo "$progname:1434: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
 
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -1486,7 +1483,7 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo $progname:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 	    pipe_works=yes
 	  else
 	    echo "$progname: failed program was:" >&5
@@ -1590,14 +1587,14 @@ else
 if test "X${lt_cv_dlopen+set}" != Xset; then
   lt_cv_dlopen=no lt_cv_dlopen_libs=
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:1593: checking for dlopen in -ldl" >&5
+echo "$progname:1590: checking for dlopen in -ldl" >&5
 if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1600 "ltconfig"
+#line 1597 "ltconfig"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -1610,7 +1607,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_dl_dlopen=yes
 else
@@ -1629,12 +1626,12 @@ if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:1632: checking for dlopen" >&5
+echo "$progname:1629: checking for dlopen" >&5
 if test "X${ac_cv_func_dlopen+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1637 "ltconfig"
+#line 1634 "ltconfig"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
 #include <assert.h>
@@ -1659,7 +1656,7 @@ dlopen();
 
 ; return 0; }
 EOF
-if { (eval echo $progname:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_dlopen=yes
 else
@@ -1676,14 +1673,14 @@ if test "X$ac_cv_func_dlopen" = Xyes; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "$progname:1679: checking for dlopen in -lsvld" >&5
+echo "$progname:1676: checking for dlopen in -lsvld" >&5
 if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsvld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1686 "ltconfig"
+#line 1683 "ltconfig"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -1696,7 +1693,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo $progname:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_svld_dlopen=yes
 else
@@ -1715,14 +1712,14 @@ if test "X$ac_cv_lib_svld_dlopen" = Xyes; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:1718: checking for dld_link in -ldld" >&5
+echo "$progname:1715: checking for dld_link in -ldld" >&5
 if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1725 "ltconfig"
+#line 1722 "ltconfig"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -1735,7 +1732,7 @@ int main() {
 dld_link()
 ; return 0; }
 EOF
-if { (eval echo $progname:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_dld_dld_link=yes
 else
@@ -1754,12 +1751,12 @@ if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:1757: checking for shl_load" >&5
+echo "$progname:1754: checking for shl_load" >&5
 if test "X${ac_cv_func_shl_load+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1762 "ltconfig"
+#line 1759 "ltconfig"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
 #include <assert.h>
@@ -1784,7 +1781,7 @@ shl_load();
 
 ; return 0; }
 EOF
-if { (eval echo $progname:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_shl_load=yes
 else
@@ -1802,14 +1799,14 @@ if test "X$ac_cv_func_shl_load" = Xyes; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:1805: checking for shl_load in -ldld" >&5
+echo "$progname:1802: checking for shl_load in -ldld" >&5
 if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1812 "ltconfig"
+#line 1809 "ltconfig"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1823,7 +1820,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo $progname:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_dld_shl_load=yes
 else
@@ -1870,18 +1867,18 @@ fi
 for ac_hdr in dlfcn.h; do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:1873: checking for $ac_hdr" >&5
+echo "$progname:1870: checking for $ac_hdr" >&5
 if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1878 "ltconfig"
+#line 1875 "ltconfig"
 #include <$ac_hdr>
 int fnord = 0;
 int main () { return(0); }
 EOF
 ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo $progname:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1909,7 +1906,7 @@ done
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
   echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1912: checking whether a program can dlopen itself" >&5
+echo "$progname:1909: checking whether a program can dlopen itself" >&5
 if test "X${lt_cv_dlopen_self+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1917,7 +1914,7 @@ else
     lt_cv_dlopen_self=cross
   else
     cat > conftest.$ac_ext <<EOF
-#line 1920 "ltconfig"
+#line 1917 "ltconfig"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -1964,7 +1961,7 @@ int main() {
                if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
-if { (eval echo $progname:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   lt_cv_dlopen_self=yes
 else
@@ -1983,7 +1980,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
   if test "$lt_cv_dlopen_self" = yes; then
     LDFLAGS="$LDFLAGS $link_static_flag"
   echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1986: checking whether a statically linked program can dlopen itself" >&5
+echo "$progname:1983: checking whether a statically linked program can dlopen itself" >&5
 if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1991,7 +1988,7 @@ else
     lt_cv_dlopen_self_static=cross
   else
     cat > conftest.$ac_ext <<EOF
-#line 1994 "ltconfig"
+#line 1991 "ltconfig"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -2038,7 +2035,7 @@ int main() {
     if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
-if { (eval echo $progname:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   lt_cv_dlopen_self_static=yes
 else
diff --git a/ltmain.sh b/ltmain.sh
index ecc7e6dfe..25e0cf9d9 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -211,8 +211,6 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
   --quiet | --silent)
     show=:
     ;;
@@ -258,7 +256,7 @@ if test -z "$show_help"; then
   # Infer the operation mode.
   if test -z "$mode"; then
     case $nonopt in
-    *cc | *++ | gcc* | *-gcc* | *CC)
+    *cc | *++ | gcc* | *-gcc*)
       mode=link
       for arg
       do
@@ -496,21 +494,11 @@ if test -z "$show_help"; then
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) tagname=CC ;;
+      "$CC "*) ;;
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) tagname=CC ;;
-      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
-	   case $base_compiler in
-	   *cc)	tagname=CC ;;
-	   *++)
-	     tagname=CXX
-	     eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	     ;;
-	   esac ;;
-      esac
-    fi
-    if test -n "$available_tags" && test -z "$tagname"; then
+      "`$echo $CC` "*) ;;
+      *)
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@ -540,6 +528,8 @@ if test -z "$show_help"; then
 #        else
 #          echo "$modename: using $tagname tagged configuration"
         fi
+	;;
+      esac
     fi
 
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
@@ -1538,21 +1528,11 @@ EOF
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) tagname=CC ;;
+      "$CC "*) ;;
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) tagname=CC ;;
-      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
-	   case $base_compiler in
-	   *cc)	tagname=CC ;;
-	   *++)
-	     tagname=CXX
-	     eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	     ;;
-	   esac ;;
-      esac
-    fi
-    if test -n "$available_tags" && test -z "$tagname"; then
+      "`$echo $CC` "*) ;;
+      *)
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@ -1582,6 +1562,8 @@ EOF
 #       else
 #         echo "$modename: using $tagname tagged configuration"
         fi
+	;;
+      esac
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1637,11 +1619,9 @@ EOF
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
       case "$libs " in
       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
       esac
-      fi
       libs="$libs $deplib"
     done
 
@@ -1652,14 +1632,12 @@ EOF
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
-      if test "X$duplicate_deps" = "Xyes" ; then
       for pre_post_dep in $predeps $postdeps; do
         case "$pre_post_deps " in
 	*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
 	esac
 	pre_post_deps="$pre_post_deps $pre_post_dep"
       done
-      fi
       pre_post_deps=
     fi
 
@@ -1883,11 +1861,9 @@ EOF
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
-              fi
 	      tmp_libs="$tmp_libs $deplib"
 	    done
 	  elif test $linkmode != prog && test $linkmode != lib; then
@@ -2010,11 +1986,9 @@ EOF
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
 	    case "$tmp_libs " in
 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	    esac
-	    fi
 	    tmp_libs="$tmp_libs $deplib"
 	  done # for deplib
 	  continue
@@ -2313,11 +2287,9 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
 	    case "$tmp_libs " in
 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	    esac
-	    fi
 	    tmp_libs="$tmp_libs $deplib"
 	  done
 
@@ -2610,7 +2582,7 @@ EOF
 	  ;;
 
 	irix)
-	  major=`expr $current - $age`
+	  major=`expr $current - $age + 1`
 	  verstring="sgi$major.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
@@ -2670,16 +2642,7 @@ EOF
 	# Clear the version info if we defaulted, and they specified a release.
 	if test -z "$vinfo" && test -n "$release"; then
 	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
+	  verstring="0.0"
 	  if test "$need_version" = no; then
 	    versuffix=
 	  else
@@ -5090,7 +5053,7 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
+      exec_cmd='"$cmd"$args'
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index 8988e2fee..d7491a426 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -245,6 +245,7 @@ noinst_DATA = \
 	monitor-icon.png
 
 subdir = mcs-plugin
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -360,7 +361,7 @@ distclean-depend:
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -371,7 +372,7 @@ distclean-depend:
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -382,7 +383,7 @@ distclean-depend:
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -393,7 +394,7 @@ distclean-depend:
 margins_plugin_la-margins_plugin.o: margins_plugin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.o -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o margins_plugin_la-margins_plugin.o `test -f 'margins_plugin.c' || echo '$(srcdir)/'`margins_plugin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='margins_plugin.c' object='margins_plugin_la-margins_plugin.o' libtool=no @AMDEPBACKSLASH@
@@ -404,7 +405,7 @@ margins_plugin_la-margins_plugin.o: margins_plugin.c
 margins_plugin_la-margins_plugin.obj: margins_plugin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.obj -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o margins_plugin_la-margins_plugin.obj `if test -f 'margins_plugin.c'; then $(CYGPATH_W) 'margins_plugin.c'; else $(CYGPATH_W) '$(srcdir)/margins_plugin.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='margins_plugin.c' object='margins_plugin_la-margins_plugin.obj' libtool=no @AMDEPBACKSLASH@
@@ -415,7 +416,7 @@ margins_plugin_la-margins_plugin.obj: margins_plugin.c
 margins_plugin_la-margins_plugin.lo: margins_plugin.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(margins_plugin_la_CFLAGS) $(CFLAGS) -MT margins_plugin_la-margins_plugin.lo -MD -MP -MF "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o margins_plugin_la-margins_plugin.lo `test -f 'margins_plugin.c' || echo '$(srcdir)/'`margins_plugin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo" "$(DEPDIR)/margins_plugin_la-margins_plugin.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/margins_plugin_la-margins_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='margins_plugin.c' object='margins_plugin_la-margins_plugin.lo' libtool=yes @AMDEPBACKSLASH@
@@ -426,7 +427,7 @@ margins_plugin_la-margins_plugin.lo: margins_plugin.c
 xfwm4_plugin_la-xfwm4_plugin.o: xfwm4_plugin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.o -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4_plugin_la-xfwm4_plugin.o `test -f 'xfwm4_plugin.c' || echo '$(srcdir)/'`xfwm4_plugin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.o' libtool=no @AMDEPBACKSLASH@
@@ -437,7 +438,7 @@ xfwm4_plugin_la-xfwm4_plugin.o: xfwm4_plugin.c
 xfwm4_plugin_la-xfwm4_plugin.obj: xfwm4_plugin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.obj -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4_plugin_la-xfwm4_plugin.obj `if test -f 'xfwm4_plugin.c'; then $(CYGPATH_W) 'xfwm4_plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfwm4_plugin.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.obj' libtool=no @AMDEPBACKSLASH@
@@ -448,7 +449,7 @@ xfwm4_plugin_la-xfwm4_plugin.obj: xfwm4_plugin.c
 xfwm4_plugin_la-xfwm4_plugin.lo: xfwm4_plugin.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_plugin_la_CFLAGS) $(CFLAGS) -MT xfwm4_plugin_la-xfwm4_plugin.lo -MD -MP -MF "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4_plugin_la-xfwm4_plugin.lo `test -f 'xfwm4_plugin.c' || echo '$(srcdir)/'`xfwm4_plugin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo" "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4_plugin_la-xfwm4_plugin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xfwm4_plugin.c' object='xfwm4_plugin_la-xfwm4_plugin.lo' libtool=yes @AMDEPBACKSLASH@
diff --git a/po/ar.gmo b/po/ar.gmo
index b7e01d317..558ac131c 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
diff --git a/po/ar.po b/po/ar.po
index 141638c15..7b2ade0e8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-31 12:54+0100\n"
 "Last-Translator: Nabil Ben Khalifa <nabil_benkhalifa@yahoo.fr>\n"
 "Language-Team:  Arabic \n"
@@ -15,36 +15,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "_بيئة العمل"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "يسار"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "يمين"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr "مخفى"
 msgid "Font Selection Dialog"
 msgstr "مربع حوار اختيار الخط"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "مدير النوافذ"
 
@@ -279,12 +279,12 @@ msgstr "المهمة عند النقر مرتين "
 msgid "Misc."
 msgstr "متفرقات"
 
-#: src/client.c:397
+#: src/client.c:406
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: net_wm_state غير مدار (نافذة %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: العملية ليست مدعومة (بعد)\n"
diff --git a/po/de.gmo b/po/de.gmo
index e69c77e20..b550684af 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index d1d1eb670..a3944e078 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-25 01:20+0100\n"
 "Last-Translator: Moritz Heiber <mistermoe@hackerboard.de>\n"
 "Language-Team: none <none@none>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 msgid "Workspace Margins"
 msgstr "Desktopränder"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "Desktopränder verändern"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Hiermit kann man Ränder definieren, über die hinaus keine Fenster gesetzt "
 "werden"
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Links"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Rechts"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "Oben :"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "Unten :"
 
@@ -113,7 +113,7 @@ msgstr "Versteckt"
 msgid "Font Selection Dialog"
 msgstr "Schriftenauswahldialog"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Fenstermanager"
 
@@ -279,12 +279,12 @@ msgstr "Aktion bei Doppelklick"
 msgid "Misc."
 msgstr "Verschiedenes"
 
-#: src/client.c:397
+#: src/client.c:406
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: Kein net_wm_state (Fenster %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operation (noch) nicht Unterstuetzt\n"
diff --git a/po/es.gmo b/po/es.gmo
index 61ae0ecb2..a416184da 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 60827f78c..61e7b020d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-23 22:06+0100\n"
 "Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -15,38 +15,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "Esc_ritorio"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "Ajustar los bordes del escritorio"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "los bordes son areas en los lados de la pantalla donde no se colocará "
 "ninguna ventana"
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Izquierda"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Derecha"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "Arriba"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "Abajo"
 
@@ -114,7 +114,7 @@ msgstr "Oculto"
 msgid "Font Selection Dialog"
 msgstr "Diálogo de Selección de Fuente"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Gestor de Ventanas"
 
@@ -287,12 +287,12 @@ msgstr "Acción al pinchar dos veces"
 msgid "Misc."
 msgstr "Misc."
 
-#: src/client.c:397
+#: src/client.c:406
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: net_wm_state sin soporte (ventana %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operación no soportada (aÃºn)\n"
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index 9a62c55b1..fbe2128ba 100644
--- a/po/es_MX.gmo
+++ b/po/es_MX.gmo
diff --git a/po/es_MX.po b/po/es_MX.po
index cee7b0f5d..f3e099852 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-23 22:06+0100\n"
 "Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -15,36 +15,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "Esc_ritorio"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Izquierda"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Derecha"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr "Oculto"
 msgid "Font Selection Dialog"
 msgstr "Diálogo de Selección de Fuente"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Administrador de Ventanas"
 
@@ -285,12 +285,12 @@ msgstr "Acción al pinchar dos veces"
 msgid "Misc."
 msgstr "Misc."
 
-#: src/client.c:397
+#: src/client.c:406
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: net_wm_state sin soporte (ventana %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operación no activa (aún)\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index 64e41b7a4..9ffd0edca 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index ef6ecbf4f..e4577e683 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Ilkka Ollakka <ilkka.j.ollakka@students.oamk.fi>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,37 +14,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "Työpöydän marginaalit"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "Muuta työpöydän marginaaleja"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
-msgstr ""
-"Marginaalit ovat näytön reunalla oleva alue jolle ikkunoita ei aseteta"
+msgstr "Marginaalit ovat näytön reunalla oleva alue jolle ikkunoita ei aseteta"
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Vasen :"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Oikea :"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "Yläosa :"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "Alaosa :"
 
@@ -112,7 +111,7 @@ msgstr "Piilotettu"
 msgid "Font Selection Dialog"
 msgstr "Fontin valinta"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Ikkunamanageri"
 
@@ -277,12 +276,12 @@ msgstr "Tuplaklikkaustoiminto"
 msgid "Misc."
 msgstr "Sekalaiset"
 
-#: src/client.c:397
+#: src/client.c:406
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: ei hallittu net_wm_state (ikkuna %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Toiminto ei ole (vielä) tuettu\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 2745c62f2..fb6f7811f 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 26c2f6abb..03117ffc4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,35 +14,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 msgid "Workspace Margins"
 msgstr "Marges de l'espace de travail"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "Ajuster les marges de l'espace de travail"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Les marges sont des zones sur les bords de l'écran où aucune fenêtre ne sera "
 "placée"
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 msgid "Left :"
 msgstr "Gauche :"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 msgid "Right :"
 msgstr "Droit :"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "Haut :"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "Bas :"
 
@@ -110,7 +110,7 @@ msgstr "Caché"
 msgid "Font Selection Dialog"
 msgstr "Sélection de Fonte"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
@@ -275,12 +275,12 @@ msgstr "Action du double clic"
 msgid "Misc."
 msgstr "Divers"
 
-#: src/client.c:397
+#: src/client.c:406
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: net_wm_state non géré (window 0x%lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operation pas (encore) supportée\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index 8c6626d8f..35b967ab4 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 33752fcaf..74b19dd53 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jasper Huijsmans <huysmans@users.sourceforge.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,36 +15,36 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "_Bureaublad"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Links"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Rechts"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr "Verborgen"
 msgid "Font Selection Dialog"
 msgstr "Lettertype selecteren"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Window Manager"
 
@@ -277,12 +277,12 @@ msgstr "Dubbelklik actie"
 msgid "Misc."
 msgstr "Overig"
 
-#: src/client.c:397
+#: src/client.c:406
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: Onbeheerde net_wm_state (venster %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Bewerking (nog) niet ondersteund\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 265fd8da4..2f0a32fa1 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 7d919950e..97d86083d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Paweł Pastuła <pastulap@poczta.onet.pl>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,37 +14,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "Marginesy obszaru roboczego"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "Ustaw marginesy"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 "Margines to obszar ekranu, w którym nie zostanie umieszczone żadne z okien."
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "Lewy :"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "Prawy :"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "Górny :"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "Dolny :"
 
@@ -112,7 +112,7 @@ msgstr "Ukryty"
 msgid "Font Selection Dialog"
 msgstr "Dialog wyboru czcionki"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "Menadżer okien"
 
@@ -279,12 +279,12 @@ msgstr "Akcja przy podwójnym kliknięciu"
 msgid "Misc."
 msgstr "Różne"
 
-#: src/client.c:397
+#: src/client.c:406
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr ""
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: Operaracja jeszcze niaktywna\n"
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index c0d04251d..1be90e6df 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,33 +15,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 msgid "Workspace Margins"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 msgid "Left :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 msgid "Right :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr ""
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Font Selection Dialog"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr ""
 
@@ -268,12 +268,12 @@ msgstr ""
 msgid "Misc."
 msgstr ""
 
-#: src/client.c:397
+#: src/client.c:406
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr ""
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 069ab5d19..5933a4f5d 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 281900107..82368329f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-03-31 23:40+0200\n"
+"POT-Creation-Date: 2003-05-04 19:45+0200\n"
 "PO-Revision-Date: 2003-01-22 00:36+0100\n"
 "Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -14,36 +14,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mcs-plugin/margins_plugin.c:113 mcs-plugin/margins_plugin.c:209
-#: mcs-plugin/margins_plugin.c:227
+#: mcs-plugin/margins_plugin.c:124 mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:232
 #, fuzzy
 msgid "Workspace Margins"
 msgstr "工作区边缘"
 
-#: mcs-plugin/margins_plugin.c:193
+#: mcs-plugin/margins_plugin.c:198
 msgid "Adjust workspace margins"
 msgstr "调整工作区边缘"
 
-#: mcs-plugin/margins_plugin.c:214
+#: mcs-plugin/margins_plugin.c:219
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "边缘是屏幕边上不能放置窗口的区域。"
 
-#: mcs-plugin/margins_plugin.c:255
+#: mcs-plugin/margins_plugin.c:260
 #, fuzzy
 msgid "Left :"
 msgstr "左侧"
 
-#: mcs-plugin/margins_plugin.c:274
+#: mcs-plugin/margins_plugin.c:279
 #, fuzzy
 msgid "Right :"
 msgstr "右侧"
 
-#: mcs-plugin/margins_plugin.c:293
+#: mcs-plugin/margins_plugin.c:298
 msgid "Top :"
 msgstr "顶端"
 
-#: mcs-plugin/margins_plugin.c:312
+#: mcs-plugin/margins_plugin.c:317
 msgid "Bottom :"
 msgstr "底部"
 
@@ -111,7 +111,7 @@ msgstr "隐藏"
 msgid "Font Selection Dialog"
 msgstr "字体选择对话框"
 
-#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1602
+#: mcs-plugin/xfwm4_plugin.c:1152 mcs-plugin/xfwm4_plugin.c:1613
 msgid "Window Manager"
 msgstr "窗口管理器"
 
@@ -278,12 +278,12 @@ msgstr "双击执行动作"
 msgid "Misc."
 msgstr "杂项"
 
-#: src/client.c:397
+#: src/client.c:406
 #, fuzzy, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr "%s: 无法管理的net_wm_state  (window %#lx)"
 
-#: src/events.c:1101
+#: src/events.c:1110
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr "%s: 尚不支持的操作\n"
diff --git a/src/Makefile.in b/src/Makefile.in
index d62bba664..edaf0362c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -227,6 +227,7 @@ EXTRA_DIST = inline-tabwin-icon.h tabwin-icon.png
 
 noinst_DATA = inline-tabwin-icon.h tabwin-icon.png
 subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -349,7 +350,7 @@ distclean-depend:
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -360,7 +361,7 @@ distclean-depend:
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -371,7 +372,7 @@ distclean-depend:
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -382,7 +383,7 @@ distclean-depend:
 xfwm4-client.o: client.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.o -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client.c' object='xfwm4-client.o' libtool=no @AMDEPBACKSLASH@
@@ -393,7 +394,7 @@ xfwm4-client.o: client.c
 xfwm4-client.obj: client.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.obj -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client.c' object='xfwm4-client.obj' libtool=no @AMDEPBACKSLASH@
@@ -404,7 +405,7 @@ xfwm4-client.obj: client.c
 xfwm4-client.lo: client.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.lo -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client.c' object='xfwm4-client.lo' libtool=yes @AMDEPBACKSLASH@
@@ -415,7 +416,7 @@ xfwm4-client.lo: client.c
 xfwm4-events.o: events.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.o -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='events.c' object='xfwm4-events.o' libtool=no @AMDEPBACKSLASH@
@@ -426,7 +427,7 @@ xfwm4-events.o: events.c
 xfwm4-events.obj: events.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.obj -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='events.c' object='xfwm4-events.obj' libtool=no @AMDEPBACKSLASH@
@@ -437,7 +438,7 @@ xfwm4-events.obj: events.c
 xfwm4-events.lo: events.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.lo -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-events.lo `test -f 'events.c' || echo '$(srcdir)/'`events.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='events.c' object='xfwm4-events.lo' libtool=yes @AMDEPBACKSLASH@
@@ -448,7 +449,7 @@ xfwm4-events.lo: events.c
 xfwm4-frame.o: frame.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.o -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-frame.o `test -f 'frame.c' || echo '$(srcdir)/'`frame.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='frame.c' object='xfwm4-frame.o' libtool=no @AMDEPBACKSLASH@
@@ -459,7 +460,7 @@ xfwm4-frame.o: frame.c
 xfwm4-frame.obj: frame.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.obj -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-frame.obj `if test -f 'frame.c'; then $(CYGPATH_W) 'frame.c'; else $(CYGPATH_W) '$(srcdir)/frame.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='frame.c' object='xfwm4-frame.obj' libtool=no @AMDEPBACKSLASH@
@@ -470,7 +471,7 @@ xfwm4-frame.obj: frame.c
 xfwm4-frame.lo: frame.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.lo -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-frame.lo `test -f 'frame.c' || echo '$(srcdir)/'`frame.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='frame.c' object='xfwm4-frame.lo' libtool=yes @AMDEPBACKSLASH@
@@ -481,7 +482,7 @@ xfwm4-frame.lo: frame.c
 xfwm4-hints.o: hints.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.o -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-hints.o `test -f 'hints.c' || echo '$(srcdir)/'`hints.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hints.c' object='xfwm4-hints.o' libtool=no @AMDEPBACKSLASH@
@@ -492,7 +493,7 @@ xfwm4-hints.o: hints.c
 xfwm4-hints.obj: hints.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.obj -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-hints.obj `if test -f 'hints.c'; then $(CYGPATH_W) 'hints.c'; else $(CYGPATH_W) '$(srcdir)/hints.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hints.c' object='xfwm4-hints.obj' libtool=no @AMDEPBACKSLASH@
@@ -503,7 +504,7 @@ xfwm4-hints.obj: hints.c
 xfwm4-hints.lo: hints.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.lo -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-hints.lo `test -f 'hints.c' || echo '$(srcdir)/'`hints.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hints.c' object='xfwm4-hints.lo' libtool=yes @AMDEPBACKSLASH@
@@ -514,7 +515,7 @@ xfwm4-hints.lo: hints.c
 xfwm4-keyboard.o: keyboard.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.o -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-keyboard.o `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keyboard.c' object='xfwm4-keyboard.o' libtool=no @AMDEPBACKSLASH@
@@ -525,7 +526,7 @@ xfwm4-keyboard.o: keyboard.c
 xfwm4-keyboard.obj: keyboard.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.obj -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-keyboard.obj `if test -f 'keyboard.c'; then $(CYGPATH_W) 'keyboard.c'; else $(CYGPATH_W) '$(srcdir)/keyboard.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keyboard.c' object='xfwm4-keyboard.obj' libtool=no @AMDEPBACKSLASH@
@@ -536,7 +537,7 @@ xfwm4-keyboard.obj: keyboard.c
 xfwm4-keyboard.lo: keyboard.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.lo -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-keyboard.lo `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keyboard.c' object='xfwm4-keyboard.lo' libtool=yes @AMDEPBACKSLASH@
@@ -547,7 +548,7 @@ xfwm4-keyboard.lo: keyboard.c
 xfwm4-main.o: main.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.o -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xfwm4-main.o' libtool=no @AMDEPBACKSLASH@
@@ -558,7 +559,7 @@ xfwm4-main.o: main.c
 xfwm4-main.obj: main.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.obj -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xfwm4-main.obj' libtool=no @AMDEPBACKSLASH@
@@ -569,7 +570,7 @@ xfwm4-main.obj: main.c
 xfwm4-main.lo: main.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.lo -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xfwm4-main.lo' libtool=yes @AMDEPBACKSLASH@
@@ -580,7 +581,7 @@ xfwm4-main.lo: main.c
 xfwm4-menu.o: menu.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.o -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-menu.o `test -f 'menu.c' || echo '$(srcdir)/'`menu.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu.c' object='xfwm4-menu.o' libtool=no @AMDEPBACKSLASH@
@@ -591,7 +592,7 @@ xfwm4-menu.o: menu.c
 xfwm4-menu.obj: menu.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.obj -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-menu.obj `if test -f 'menu.c'; then $(CYGPATH_W) 'menu.c'; else $(CYGPATH_W) '$(srcdir)/menu.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu.c' object='xfwm4-menu.obj' libtool=no @AMDEPBACKSLASH@
@@ -602,7 +603,7 @@ xfwm4-menu.obj: menu.c
 xfwm4-menu.lo: menu.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.lo -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-menu.lo `test -f 'menu.c' || echo '$(srcdir)/'`menu.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu.c' object='xfwm4-menu.lo' libtool=yes @AMDEPBACKSLASH@
@@ -613,7 +614,7 @@ xfwm4-menu.lo: menu.c
 xfwm4-misc.o: misc.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.o -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xfwm4-misc.o' libtool=no @AMDEPBACKSLASH@
@@ -624,7 +625,7 @@ xfwm4-misc.o: misc.c
 xfwm4-misc.obj: misc.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xfwm4-misc.obj' libtool=no @AMDEPBACKSLASH@
@@ -635,7 +636,7 @@ xfwm4-misc.obj: misc.c
 xfwm4-misc.lo: misc.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.lo -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xfwm4-misc.lo' libtool=yes @AMDEPBACKSLASH@
@@ -646,7 +647,7 @@ xfwm4-misc.lo: misc.c
 xfwm4-mypixmap.o: mypixmap.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.o -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.o `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.o' libtool=no @AMDEPBACKSLASH@
@@ -657,7 +658,7 @@ xfwm4-mypixmap.o: mypixmap.c
 xfwm4-mypixmap.obj: mypixmap.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.obj -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.obj `if test -f 'mypixmap.c'; then $(CYGPATH_W) 'mypixmap.c'; else $(CYGPATH_W) '$(srcdir)/mypixmap.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.obj' libtool=no @AMDEPBACKSLASH@
@@ -668,7 +669,7 @@ xfwm4-mypixmap.obj: mypixmap.c
 xfwm4-mypixmap.lo: mypixmap.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.lo -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.lo `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.lo' libtool=yes @AMDEPBACKSLASH@
@@ -679,7 +680,7 @@ xfwm4-mypixmap.lo: mypixmap.c
 xfwm4-mywindow.o: mywindow.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.o -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mywindow.o `test -f 'mywindow.c' || echo '$(srcdir)/'`mywindow.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mywindow.c' object='xfwm4-mywindow.o' libtool=no @AMDEPBACKSLASH@
@@ -690,7 +691,7 @@ xfwm4-mywindow.o: mywindow.c
 xfwm4-mywindow.obj: mywindow.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.obj -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mywindow.obj `if test -f 'mywindow.c'; then $(CYGPATH_W) 'mywindow.c'; else $(CYGPATH_W) '$(srcdir)/mywindow.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mywindow.c' object='xfwm4-mywindow.obj' libtool=no @AMDEPBACKSLASH@
@@ -701,7 +702,7 @@ xfwm4-mywindow.obj: mywindow.c
 xfwm4-mywindow.lo: mywindow.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.lo -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mywindow.lo `test -f 'mywindow.c' || echo '$(srcdir)/'`mywindow.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-mywindow.Tpo" "$(DEPDIR)/xfwm4-mywindow.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mywindow.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mywindow.c' object='xfwm4-mywindow.lo' libtool=yes @AMDEPBACKSLASH@
@@ -712,7 +713,7 @@ xfwm4-mywindow.lo: mywindow.c
 xfwm4-parserc.o: parserc.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.o -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-parserc.o `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parserc.c' object='xfwm4-parserc.o' libtool=no @AMDEPBACKSLASH@
@@ -723,7 +724,7 @@ xfwm4-parserc.o: parserc.c
 xfwm4-parserc.obj: parserc.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-parserc.obj `if test -f 'parserc.c'; then $(CYGPATH_W) 'parserc.c'; else $(CYGPATH_W) '$(srcdir)/parserc.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parserc.c' object='xfwm4-parserc.obj' libtool=no @AMDEPBACKSLASH@
@@ -734,7 +735,7 @@ xfwm4-parserc.obj: parserc.c
 xfwm4-parserc.lo: parserc.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.lo -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-parserc.lo `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parserc.c' object='xfwm4-parserc.lo' libtool=yes @AMDEPBACKSLASH@
@@ -745,7 +746,7 @@ xfwm4-parserc.lo: parserc.c
 xfwm4-session.o: session.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.o -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-session.o `test -f 'session.c' || echo '$(srcdir)/'`session.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session.c' object='xfwm4-session.o' libtool=no @AMDEPBACKSLASH@
@@ -756,7 +757,7 @@ xfwm4-session.o: session.c
 xfwm4-session.obj: session.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.obj -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-session.obj `if test -f 'session.c'; then $(CYGPATH_W) 'session.c'; else $(CYGPATH_W) '$(srcdir)/session.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session.c' object='xfwm4-session.obj' libtool=no @AMDEPBACKSLASH@
@@ -767,7 +768,7 @@ xfwm4-session.obj: session.c
 xfwm4-session.lo: session.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.lo -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-session.lo `test -f 'session.c' || echo '$(srcdir)/'`session.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-session.Tpo" "$(DEPDIR)/xfwm4-session.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-session.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session.c' object='xfwm4-session.lo' libtool=yes @AMDEPBACKSLASH@
@@ -778,7 +779,7 @@ xfwm4-session.lo: session.c
 xfwm4-settings.o: settings.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.o -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='xfwm4-settings.o' libtool=no @AMDEPBACKSLASH@
@@ -789,7 +790,7 @@ xfwm4-settings.o: settings.c
 xfwm4-settings.obj: settings.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.obj -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='xfwm4-settings.obj' libtool=no @AMDEPBACKSLASH@
@@ -800,7 +801,7 @@ xfwm4-settings.obj: settings.c
 xfwm4-settings.lo: settings.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.lo -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-settings.lo `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='xfwm4-settings.lo' libtool=yes @AMDEPBACKSLASH@
@@ -811,7 +812,7 @@ xfwm4-settings.lo: settings.c
 xfwm4-startup_notification.o: startup_notification.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.o -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-startup_notification.o `test -f 'startup_notification.c' || echo '$(srcdir)/'`startup_notification.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='startup_notification.c' object='xfwm4-startup_notification.o' libtool=no @AMDEPBACKSLASH@
@@ -822,7 +823,7 @@ xfwm4-startup_notification.o: startup_notification.c
 xfwm4-startup_notification.obj: startup_notification.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.obj -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-startup_notification.obj `if test -f 'startup_notification.c'; then $(CYGPATH_W) 'startup_notification.c'; else $(CYGPATH_W) '$(srcdir)/startup_notification.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='startup_notification.c' object='xfwm4-startup_notification.obj' libtool=no @AMDEPBACKSLASH@
@@ -833,7 +834,7 @@ xfwm4-startup_notification.obj: startup_notification.c
 xfwm4-startup_notification.lo: startup_notification.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-startup_notification.lo -MD -MP -MF "$(DEPDIR)/xfwm4-startup_notification.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-startup_notification.lo `test -f 'startup_notification.c' || echo '$(srcdir)/'`startup_notification.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-startup_notification.Tpo" "$(DEPDIR)/xfwm4-startup_notification.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-startup_notification.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='startup_notification.c' object='xfwm4-startup_notification.lo' libtool=yes @AMDEPBACKSLASH@
@@ -844,7 +845,7 @@ xfwm4-startup_notification.lo: startup_notification.c
 xfwm4-spinning_cursor.o: spinning_cursor.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.o -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-spinning_cursor.o `test -f 'spinning_cursor.c' || echo '$(srcdir)/'`spinning_cursor.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spinning_cursor.c' object='xfwm4-spinning_cursor.o' libtool=no @AMDEPBACKSLASH@
@@ -855,7 +856,7 @@ xfwm4-spinning_cursor.o: spinning_cursor.c
 xfwm4-spinning_cursor.obj: spinning_cursor.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.obj -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-spinning_cursor.obj `if test -f 'spinning_cursor.c'; then $(CYGPATH_W) 'spinning_cursor.c'; else $(CYGPATH_W) '$(srcdir)/spinning_cursor.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spinning_cursor.c' object='xfwm4-spinning_cursor.obj' libtool=no @AMDEPBACKSLASH@
@@ -866,7 +867,7 @@ xfwm4-spinning_cursor.obj: spinning_cursor.c
 xfwm4-spinning_cursor.lo: spinning_cursor.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-spinning_cursor.lo -MD -MP -MF "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-spinning_cursor.lo `test -f 'spinning_cursor.c' || echo '$(srcdir)/'`spinning_cursor.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo" "$(DEPDIR)/xfwm4-spinning_cursor.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-spinning_cursor.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spinning_cursor.c' object='xfwm4-spinning_cursor.lo' libtool=yes @AMDEPBACKSLASH@
@@ -877,7 +878,7 @@ xfwm4-spinning_cursor.lo: spinning_cursor.c
 xfwm4-tabwin.o: tabwin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.o -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-tabwin.o `test -f 'tabwin.c' || echo '$(srcdir)/'`tabwin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tabwin.c' object='xfwm4-tabwin.o' libtool=no @AMDEPBACKSLASH@
@@ -888,7 +889,7 @@ xfwm4-tabwin.o: tabwin.c
 xfwm4-tabwin.obj: tabwin.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.obj -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-tabwin.obj `if test -f 'tabwin.c'; then $(CYGPATH_W) 'tabwin.c'; else $(CYGPATH_W) '$(srcdir)/tabwin.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tabwin.c' object='xfwm4-tabwin.obj' libtool=no @AMDEPBACKSLASH@
@@ -899,7 +900,7 @@ xfwm4-tabwin.obj: tabwin.c
 xfwm4-tabwin.lo: tabwin.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-tabwin.lo -MD -MP -MF "$(DEPDIR)/xfwm4-tabwin.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-tabwin.lo `test -f 'tabwin.c' || echo '$(srcdir)/'`tabwin.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-tabwin.Tpo" "$(DEPDIR)/xfwm4-tabwin.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-tabwin.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tabwin.c' object='xfwm4-tabwin.lo' libtool=yes @AMDEPBACKSLASH@
@@ -910,7 +911,7 @@ xfwm4-tabwin.lo: tabwin.c
 xfwm4-workspaces.o: workspaces.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.o -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-workspaces.o `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='workspaces.c' object='xfwm4-workspaces.o' libtool=no @AMDEPBACKSLASH@
@@ -921,7 +922,7 @@ xfwm4-workspaces.o: workspaces.c
 xfwm4-workspaces.obj: workspaces.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.obj -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-workspaces.obj `if test -f 'workspaces.c'; then $(CYGPATH_W) 'workspaces.c'; else $(CYGPATH_W) '$(srcdir)/workspaces.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='workspaces.c' object='xfwm4-workspaces.obj' libtool=no @AMDEPBACKSLASH@
@@ -932,7 +933,7 @@ xfwm4-workspaces.obj: workspaces.c
 xfwm4-workspaces.lo: workspaces.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.lo -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-workspaces.lo `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Plo"; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Plo"; \
 @am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='workspaces.c' object='xfwm4-workspaces.lo' libtool=yes @AMDEPBACKSLASH@
diff --git a/themes/Makefile.in b/themes/Makefile.in
index 3ea2f0600..eac4bbfa1 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -233,6 +233,7 @@ SUBDIRS = \
 	xfce
 
 subdir = themes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -344,9 +345,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
diff --git a/themes/adept/Makefile.in b/themes/adept/Makefile.in
index 9dcd13223..95fe62762 100644
--- a/themes/adept/Makefile.in
+++ b/themes/adept/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -202,6 +202,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/adept
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/agua/Makefile.in b/themes/agua/Makefile.in
index 4a2f594f8..bacb31ca9 100644
--- a/themes/agua/Makefile.in
+++ b/themes/agua/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/agua
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/atlanta/Makefile.in b/themes/atlanta/Makefile.in
index 9066a1f9e..ec70564a5 100644
--- a/themes/atlanta/Makefile.in
+++ b/themes/atlanta/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/atlanta
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/atlanta2/Makefile.in b/themes/atlanta2/Makefile.in
index 456189b1a..544af570a 100644
--- a/themes/atlanta2/Makefile.in
+++ b/themes/atlanta2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/atlanta2
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/b5/Makefile.in b/themes/b5/Makefile.in
index 8311eba68..c921d6819 100644
--- a/themes/b5/Makefile.in
+++ b/themes/b5/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -196,6 +196,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/b5
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/b6/Makefile.in b/themes/b6/Makefile.in
index e2bd72342..36844db22 100644
--- a/themes/b6/Makefile.in
+++ b/themes/b6/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/b6
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/bbs/Makefile.in b/themes/bbs/Makefile.in
index 363afa59e..9bbb87733 100644
--- a/themes/bbs/Makefile.in
+++ b/themes/bbs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/bbs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/beastie/Makefile.in b/themes/beastie/Makefile.in
index cd82600b8..e11d7ae4c 100644
--- a/themes/beastie/Makefile.in
+++ b/themes/beastie/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -212,6 +212,7 @@ theme_DATA = README\
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/beastie
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/biz/Makefile.in b/themes/biz/Makefile.in
index 837c40506..3e6789c6c 100644
--- a/themes/biz/Makefile.in
+++ b/themes/biz/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/biz
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/coldsteel/Makefile.in b/themes/coldsteel/Makefile.in
index 6f409598d..cb024ba63 100644
--- a/themes/coldsteel/Makefile.in
+++ b/themes/coldsteel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/coldsteel
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/coolclean/Makefile.in b/themes/coolclean/Makefile.in
index b4b6e8bd2..3cefb995f 100644
--- a/themes/coolclean/Makefile.in
+++ b/themes/coolclean/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/coolclean
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/crux/Makefile.in b/themes/crux/Makefile.in
index bfe32169e..4bdde6974 100644
--- a/themes/crux/Makefile.in
+++ b/themes/crux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/crux
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/cruxish/Makefile.in b/themes/cruxish/Makefile.in
index 2dea6b975..bc0e6f897 100644
--- a/themes/cruxish/Makefile.in
+++ b/themes/cruxish/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/cruxish
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/curve/Makefile.in b/themes/curve/Makefile.in
index e3398cddc..ebab2471d 100644
--- a/themes/curve/Makefile.in
+++ b/themes/curve/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/curve
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index 01fec7f8a..437998355 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -167,6 +167,7 @@ themedir = $(pkgdatadir)/themes/default.keys
 theme_DATA = keythemerc
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/default.keys
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index 2b9103577..8b4a2eba5 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,6 +220,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/default
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/eazel-blue/Makefile.in b/themes/eazel-blue/Makefile.in
index 4b4934ba2..3af2a1854 100644
--- a/themes/eazel-blue/Makefile.in
+++ b/themes/eazel-blue/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/eazel-blue
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/elberg/Makefile.in b/themes/elberg/Makefile.in
index d8f048499..532c26bbc 100644
--- a/themes/elberg/Makefile.in
+++ b/themes/elberg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/elberg
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/exocet/Makefile.in b/themes/exocet/Makefile.in
index 82a9e9ef8..5f121c70a 100644
--- a/themes/exocet/Makefile.in
+++ b/themes/exocet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/exocet
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/fbx/Makefile.in b/themes/fbx/Makefile.in
index e9f317ee4..40263c8dd 100644
--- a/themes/fbx/Makefile.in
+++ b/themes/fbx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/fbx
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/g2/Makefile.in b/themes/g2/Makefile.in
index 188b499de..e96c03e7b 100644
--- a/themes/g2/Makefile.in
+++ b/themes/g2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/g2
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/gaudy/Makefile.in b/themes/gaudy/Makefile.in
index 843fdcd36..c7e42134a 100644
--- a/themes/gaudy/Makefile.in
+++ b/themes/gaudy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/gaudy
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/gnububble/Makefile.in b/themes/gnububble/Makefile.in
index e10e06fc4..8e18fcb3e 100644
--- a/themes/gnububble/Makefile.in
+++ b/themes/gnububble/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/gnububble
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/gorilla/Makefile.in b/themes/gorilla/Makefile.in
index 909c46cfb..0ed778806 100644
--- a/themes/gorilla/Makefile.in
+++ b/themes/gorilla/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/gorilla
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/gtk/Makefile.in b/themes/gtk/Makefile.in
index 0e4d5b18f..2b673b6b0 100644
--- a/themes/gtk/Makefile.in
+++ b/themes/gtk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,6 +220,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/gtk
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/iceg/Makefile.in b/themes/iceg/Makefile.in
index 97de3e433..a60ca72ea 100644
--- a/themes/iceg/Makefile.in
+++ b/themes/iceg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/iceg
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/kde/Makefile.in b/themes/kde/Makefile.in
index 74e097424..d3223c3c4 100644
--- a/themes/kde/Makefile.in
+++ b/themes/kde/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/kde
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/keramik/Makefile.in b/themes/keramik/Makefile.in
index 84958d79e..6b9c699c5 100644
--- a/themes/keramik/Makefile.in
+++ b/themes/keramik/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/keramik
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/kindaker/Makefile.in b/themes/kindaker/Makefile.in
index 078881ab0..07cd1e8e9 100644
--- a/themes/kindaker/Makefile.in
+++ b/themes/kindaker/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/kindaker
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/koynacity/Makefile.in b/themes/koynacity/Makefile.in
index 8eb183ecc..a5ee38b75 100644
--- a/themes/koynacity/Makefile.in
+++ b/themes/koynacity/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/koynacity
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/linea/Makefile.in b/themes/linea/Makefile.in
index 553f476fd..68d1919a8 100644
--- a/themes/linea/Makefile.in
+++ b/themes/linea/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/linea
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/meenee/Makefile.in b/themes/meenee/Makefile.in
index 539c6abcb..48988dc0c 100644
--- a/themes/meenee/Makefile.in
+++ b/themes/meenee/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/meenee
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/metabox/Makefile.in b/themes/metabox/Makefile.in
index f7d7b93ed..c7e5eaa2c 100644
--- a/themes/metabox/Makefile.in
+++ b/themes/metabox/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/metabox
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/microcurve/Makefile.in b/themes/microcurve/Makefile.in
index bfc06b195..d94b74a95 100644
--- a/themes/microcurve/Makefile.in
+++ b/themes/microcurve/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/microcurve
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck/Makefile.in b/themes/microdeck/Makefile.in
index 8b18d7975..5938d3b32 100644
--- a/themes/microdeck/Makefile.in
+++ b/themes/microdeck/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,6 +220,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/microdeck
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck2/Makefile.in b/themes/microdeck2/Makefile.in
index a915f6784..c025b5f3d 100644
--- a/themes/microdeck2/Makefile.in
+++ b/themes/microdeck2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/microdeck2
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/microdeck3/Makefile.in b/themes/microdeck3/Makefile.in
index 2b33398cc..d1b897d36 100644
--- a/themes/microdeck3/Makefile.in
+++ b/themes/microdeck3/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/microdeck3
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/microgui/Makefile.in b/themes/microgui/Makefile.in
index 96b08b9ac..3bcad35fe 100644
--- a/themes/microgui/Makefile.in
+++ b/themes/microgui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/microgui
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/mofit/Makefile.in b/themes/mofit/Makefile.in
index bb5f76a62..697e004ab 100644
--- a/themes/mofit/Makefile.in
+++ b/themes/mofit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/mofit
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/next/Makefile.in b/themes/next/Makefile.in
index c3e0d3cd7..e9606081a 100644
--- a/themes/next/Makefile.in
+++ b/themes/next/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/next
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/ops/Makefile.in b/themes/ops/Makefile.in
index 0f5d42dfe..fdc03a777 100644
--- a/themes/ops/Makefile.in
+++ b/themes/ops/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/ops
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/oroborus/Makefile.in b/themes/oroborus/Makefile.in
index c1b51a107..45e7249b9 100644
--- a/themes/oroborus/Makefile.in
+++ b/themes/oroborus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/oroborus
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/perl/Makefile.in b/themes/perl/Makefile.in
index d97c45fd9..6aeb94030 100644
--- a/themes/perl/Makefile.in
+++ b/themes/perl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/perl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/pills/Makefile.in b/themes/pills/Makefile.in
index c3f93f283..3470477f7 100644
--- a/themes/pills/Makefile.in
+++ b/themes/pills/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/pills
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/piranha/Makefile.in b/themes/piranha/Makefile.in
index d22e0269a..a16b68017 100644
--- a/themes/piranha/Makefile.in
+++ b/themes/piranha/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/piranha
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/platinum/Makefile.in b/themes/platinum/Makefile.in
index 444011dc8..f8dad8854 100644
--- a/themes/platinum/Makefile.in
+++ b/themes/platinum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/platinum
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/quiet-purple/Makefile.in b/themes/quiet-purple/Makefile.in
index 04eaba786..d674b3d2a 100644
--- a/themes/quiet-purple/Makefile.in
+++ b/themes/quiet-purple/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/quiet-purple
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/quinx/Makefile.in b/themes/quinx/Makefile.in
index 06bc1c1e7..9e21ccd79 100644
--- a/themes/quinx/Makefile.in
+++ b/themes/quinx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -208,6 +208,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/quinx
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/r9x/Makefile.in b/themes/r9x/Makefile.in
index a019fff28..a9758bbf9 100644
--- a/themes/r9x/Makefile.in
+++ b/themes/r9x/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/r9x
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/redmond/Makefile.in b/themes/redmond/Makefile.in
index 5936a1b97..f43d43841 100644
--- a/themes/redmond/Makefile.in
+++ b/themes/redmond/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/redmond
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/redmondxp/Makefile.in b/themes/redmondxp/Makefile.in
index 111cee8a5..305d78bbf 100644
--- a/themes/redmondxp/Makefile.in
+++ b/themes/redmondxp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/redmondxp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/retro/Makefile.in b/themes/retro/Makefile.in
index b0571ba77..65c520c0d 100644
--- a/themes/retro/Makefile.in
+++ b/themes/retro/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/retro
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/silverado/Makefile.in b/themes/silverado/Makefile.in
index 870ee2709..bf7fbd7eb 100644
--- a/themes/silverado/Makefile.in
+++ b/themes/silverado/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -205,6 +205,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/silverado
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/slick/Makefile.in b/themes/slick/Makefile.in
index 138b83e86..47647a5b6 100644
--- a/themes/slick/Makefile.in
+++ b/themes/slick/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/slick
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/slimline/Makefile.in b/themes/slimline/Makefile.in
index f3fe32a67..79efa51b1 100644
--- a/themes/slimline/Makefile.in
+++ b/themes/slimline/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/slimline
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/tabs/Makefile.in b/themes/tabs/Makefile.in
index e101eb185..57f63edd5 100644
--- a/themes/tabs/Makefile.in
+++ b/themes/tabs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/tabs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/tgc/Makefile.in b/themes/tgc/Makefile.in
index 6e3af3238..ffb6d739c 100644
--- a/themes/tgc/Makefile.in
+++ b/themes/tgc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/tgc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/totem/Makefile.in b/themes/totem/Makefile.in
index be12b51a7..2de9f91d9 100644
--- a/themes/totem/Makefile.in
+++ b/themes/totem/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/totem
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/trench/Makefile.in b/themes/trench/Makefile.in
index e6145bc9f..9d60e8d41 100644
--- a/themes/trench/Makefile.in
+++ b/themes/trench/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/trench
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/triviality/Makefile.in b/themes/triviality/Makefile.in
index a345bd87c..8128116c4 100644
--- a/themes/triviality/Makefile.in
+++ b/themes/triviality/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -220,6 +220,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/triviality
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/tux/Makefile.in b/themes/tux/Makefile.in
index a6071b39a..cb8294fc2 100644
--- a/themes/tux/Makefile.in
+++ b/themes/tux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -212,6 +212,7 @@ top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/tux
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/variation/Makefile.in b/themes/variation/Makefile.in
index 67cf9865c..1a36b8c8c 100644
--- a/themes/variation/Makefile.in
+++ b/themes/variation/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/variation
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
diff --git a/themes/xfce/Makefile.in b/themes/xfce/Makefile.in
index db21f454f..ce9ec88d0 100644
--- a/themes/xfce/Makefile.in
+++ b/themes/xfce/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.4 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -211,6 +211,7 @@ theme_DATA = README \
 
 EXTRA_DIST = $(theme_DATA)
 subdir = themes/xfce
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
author	Jasper Huijsmans <jbhuijsmans@home.nl>	2003-05-04 18:21:05 +0000
committer	Jasper Huijsmans <jbhuijsmans@home.nl>	2003-05-04 18:21:05 +0000
commit	69dba2aea955b794232c96bb957cf416f3eef73b (patch)
tree	a119521d4759d17a8958d49adeaa9aad26c928c4
parent	2a0827d882629ea33a678f5013fa2ea653a5c5e2 (diff)
download	xfwm4-69dba2aea955b794232c96bb957cf416f3eef73b.tar.gz