diff --git a/Makefile.in b/Makefile.in
index 598636d70d515d4d6594546631b91023b2d2239a..fe391d935b33edefef0a2389a5594c2f14688da9 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.5 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -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
diff --git a/config.guess b/config.guess
index 4fc21ecc3aa7606ce71a99fdd93754826e14b11c..6bdac8d7b61dbfc872cf150a34c8a73b420fa0bb 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-05-09'
 
 # 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}'`
@@ -747,7 +744,7 @@ EOF
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*)
+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -1036,7 +1033,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
diff --git a/config.sub b/config.sub
index 5f94062aafd8a9cc46f1322e63263ba3aa9594c4..fe4f1edf3c0d2ff94ac211a8523f02b481c45810 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-05-09'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -373,6 +373,9 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -1128,7 +1131,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/defaults/Makefile.in b/defaults/Makefile.in
index 75b219e69c2b5fe4c3f8959c3726e0f3d45605a3..b393bbc849c4cef7e9d2fff0145fe672569e3494 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.5 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 =
@@ -254,7 +255,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(defaultsdir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index 666ba4ab4364f78867525a7ae1876ef31bf52bbb..77da1cac80be49f9f5966e5f46df23861ba0ad86 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.5 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -179,6 +179,7 @@ doc_DATA = \
 
 EXTRA_DIST = $(noinst_DATA) $(doc_DATA)
 subdir = doc/C
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -310,9 +311,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/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index 679aae4b183146b66cb4c3d03c81400a74f8ef8d..09dfdb957eb374cb3f599031078e2f7eabf8d3e0 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.5 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -174,6 +174,7 @@ images_DATA = \
 
 EXTRA_DIST = $(images_DATA)
 subdir = doc/C/images
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -261,7 +262,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(imagesdir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 314cbbf25c56b97587667e93cd565575779fdd8c..8b5c0c0162475c3fdca1574a9ad2603bcdcc92ff 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.5 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -173,6 +173,7 @@ noinst_DATA = \
 
 EXTRA_DIST = $(noinst_DATA)
 subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -286,9 +287,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/install-sh b/install-sh
index 36f96f3e033cfaeefc092147d99d92f78e030d12..0ec27bcd488da5cad6ead13d70accbdbc40d31ef 100755
--- a/install-sh
+++ b/install-sh
@@ -1,19 +1,37 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
diff --git a/ltcf-c.sh b/ltcf-c.sh
index d9bbae95441e9f0c55bf9eb72e570ceb2469b2ef..570aa4541701f4d971f75fdba7c1954326365912 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -173,23 +173,13 @@ 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 -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'
+      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'
     fi
     ;;
 
@@ -379,6 +369,23 @@ 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
     ;;
@@ -644,7 +651,7 @@ else
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      lt_cv_prog_cc_pic='-fno-common'
+      ac_cv_prog_cc_pic='-fno-common'
       ;;
     *djgpp*)
       # DJGPP does not support shared libraries at all
diff --git a/ltconfig b/ltconfig
index 1eb4072f95de2d917e086337ad3a336def6ca818..91907462a058bc24fb712e357573c251e0e63865 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,16 +1116,17 @@ freebsd1*)
 
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+  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'
       need_version=no
       need_lc=no
       need_lib_prefix=no
       ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+    *)
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
       need_version=yes
       ;;
   esac
@@ -1167,7 +1168,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 irix5* | irix6*)
-  version_type=irix
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   soname_spec='${libname}${release}.so$major'
@@ -1198,7 +1199,7 @@ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1236,6 +1237,8 @@ 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)
@@ -1282,7 +1285,7 @@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -1427,11 +1430,11 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  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
+  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
     # Now try to grab the symbols.
     nlist=conftest.nm
-    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
+    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
 
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -1483,7 +1486,7 @@ EOF
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo $progname:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 	    pipe_works=yes
 	  else
 	    echo "$progname: failed program was:" >&5
@@ -1587,14 +1590,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:1590: checking for dlopen in -ldl" >&5
+echo "$progname:1593: 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 1597 "ltconfig"
+#line 1600 "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.  */
@@ -1607,7 +1610,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo $progname:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1613: \"$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
@@ -1626,12 +1629,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:1629: checking for dlopen" >&5
+echo "$progname:1632: 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 1634 "ltconfig"
+#line 1637 "ltconfig"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
 #include <assert.h>
@@ -1656,7 +1659,7 @@ dlopen();
 
 ; return 0; }
 EOF
-if { (eval echo $progname:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_dlopen=yes
 else
@@ -1673,14 +1676,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:1676: checking for dlopen in -lsvld" >&5
+echo "$progname:1679: 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 1683 "ltconfig"
+#line 1686 "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.  */
@@ -1693,7 +1696,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo $progname:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1699: \"$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
@@ -1712,14 +1715,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:1715: checking for dld_link in -ldld" >&5
+echo "$progname:1718: 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 1722 "ltconfig"
+#line 1725 "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.  */
@@ -1732,7 +1735,7 @@ int main() {
 dld_link()
 ; return 0; }
 EOF
-if { (eval echo $progname:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1738: \"$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
@@ -1751,12 +1754,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:1754: checking for shl_load" >&5
+echo "$progname:1757: 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 1759 "ltconfig"
+#line 1762 "ltconfig"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
 #include <assert.h>
@@ -1781,7 +1784,7 @@ shl_load();
 
 ; return 0; }
 EOF
-if { (eval echo $progname:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1787: \"$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
@@ -1799,14 +1802,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:1802: checking for shl_load in -ldld" >&5
+echo "$progname:1805: 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 1809 "ltconfig"
+#line 1812 "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
@@ -1820,7 +1823,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo $progname:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo $progname:1826: \"$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
@@ -1867,18 +1870,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:1870: checking for $ac_hdr" >&5
+echo "$progname:1873: 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 1875 "ltconfig"
+#line 1878 "ltconfig"
 #include <$ac_hdr>
 int fnord = 0;
 int main () { return(0); }
 EOF
 ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo $progname:1884: \"$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*
@@ -1906,7 +1909,7 @@ done
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
   echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:1909: checking whether a program can dlopen itself" >&5
+echo "$progname:1912: 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
@@ -1914,7 +1917,7 @@ else
     lt_cv_dlopen_self=cross
   else
     cat > conftest.$ac_ext <<EOF
-#line 1917 "ltconfig"
+#line 1920 "ltconfig"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -1961,7 +1964,7 @@ int main() {
                if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
-if { (eval echo $progname:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   lt_cv_dlopen_self=yes
 else
@@ -1980,7 +1983,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:1983: checking whether a statically linked program can dlopen itself" >&5
+echo "$progname:1986: 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
@@ -1988,7 +1991,7 @@ else
     lt_cv_dlopen_self_static=cross
   else
     cat > conftest.$ac_ext <<EOF
-#line 1991 "ltconfig"
+#line 1994 "ltconfig"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -2035,7 +2038,7 @@ int main() {
     if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
-if { (eval echo $progname:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:2041: \"$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 25e0cf9d99ae6e9344f9fab8006d1870d2c167ad..ecc7e6dfe824032c2599f152ec4946ae6b56ed07 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -211,6 +211,8 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
   --quiet | --silent)
     show=:
     ;;
@@ -256,7 +258,7 @@ if test -z "$show_help"; then
   # Infer the operation mode.
   if test -z "$mode"; then
     case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
+    *cc | *++ | gcc* | *-gcc* | *CC)
       mode=link
       for arg
       do
@@ -494,11 +496,21 @@ 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 "*) ;;
+      "$CC "*) tagname=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` "*) ;;
-      *)
+      "`$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
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@ -528,8 +540,6 @@ if test -z "$show_help"; then
 #        else
 #          echo "$modename: using $tagname tagged configuration"
         fi
-	;;
-      esac
     fi
 
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
@@ -1528,11 +1538,21 @@ EOF
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) ;;
+      "$CC "*) tagname=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` "*) ;;
-      *)
+      "`$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
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@ -1562,8 +1582,6 @@ EOF
 #       else
 #         echo "$modename: using $tagname tagged configuration"
         fi
-	;;
-      esac
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1619,9 +1637,11 @@ 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
 
@@ -1632,12 +1652,14 @@ 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
 
@@ -1861,9 +1883,11 @@ 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
@@ -1986,9 +2010,11 @@ 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
@@ -2287,9 +2313,11 @@ 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
 
@@ -2582,7 +2610,7 @@ EOF
 	  ;;
 
 	irix)
-	  major=`expr $current - $age + 1`
+	  major=`expr $current - $age`
 	  verstring="sgi$major.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
@@ -2642,7 +2670,16 @@ EOF
 	# Clear the version info if we defaulted, and they specified a release.
 	if test -z "$vinfo" && test -n "$release"; then
 	  major=
-	  verstring="0.0"
+	  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
 	  if test "$need_version" = no; then
 	    versuffix=
 	  else
@@ -5053,7 +5090,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 8988e2fee5018702da4717f7202876548d2fdc70..d084b460bddb6a6bf67695e5e83aa10854c426f8 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.5 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@
@@ -557,7 +558,6 @@ all-am: Makefile $(LTLIBRARIES) $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(margins_plugindir) $(DESTDIR)$(xfwm4_plugindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/mcs-plugin/margins_plugin.c b/mcs-plugin/margins_plugin.c
index 156796c4634a38bdeb0deae33c837dbb7acee32c..ec9fc1a067116cc728202a964374a971a2160a7b 100644
--- a/mcs-plugin/margins_plugin.c
+++ b/mcs-plugin/margins_plugin.c
@@ -110,18 +110,22 @@ save_channel (McsManager * manager, const char *channel, const char *rcfile)
 McsPluginInitResult
 mcs_plugin_init (McsPlugin * mcs_plugin)
 {
+#if 0
 #ifdef ENABLE_NLS
-    /* 
-       This is required for UTF-8 at least - Please don't remove it
-       And it needs to be done here for the label to be properly
-       localized....
-     */
     bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
     textdomain (GETTEXT_PACKAGE);
 #endif
+#else
+    /* 
+       This is required for UTF-8 at least - Please don't remove it
+       And it needs to be done here for the label to be properly
+       localized....
+     */
+    xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+#endif
 
     manager = mcs_plugin->manager;
 
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index bc03ee34e10bf7783dd1bf1502323bfc431277a8..2708f8aec75cf01732d67a079a03e4e319aed1d7 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -1823,6 +1823,7 @@ setup_dialog (Itf * itf)
 McsPluginInitResult
 mcs_plugin_init (McsPlugin * mcs_plugin)
 {
+#if 0
 #ifdef ENABLE_NLS
     /* 
        This is required for UTF-8 at least - Please don't remove it
@@ -1835,6 +1836,9 @@ mcs_plugin_init (McsPlugin * mcs_plugin)
 #endif
     textdomain (GETTEXT_PACKAGE);
 #endif
+#else
+    xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+#endif
 
     create_channel (mcs_plugin);
     mcs_plugin->plugin_name = g_strdup (PLUGIN_NAME);
diff --git a/src/Makefile.in b/src/Makefile.in
index d62bba66471b64d38da1ed1d2c6388ad5e3310ca..db6144523484c13d5a67666d9014ce64c8a7e366 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.5 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@
@@ -1041,7 +1042,6 @@ all-am: Makefile $(PROGRAMS) $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/src/main.c b/src/main.c
index 553265e42b01b13942f22062a9728c5032ad9882..dcb7879addc0700ba486816becd4e63e35a24652 100644
--- a/src/main.c
+++ b/src/main.c
@@ -206,14 +206,17 @@ initialize (int argc, char **argv)
 
     progname = argv[0];
 
+#if 0
 #ifdef ENABLE_NLS
-
     bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
     textdomain (GETTEXT_PACKAGE);
 #endif
+#else
+    xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+#endif
 
     gtk_set_locale ();
     gtk_init (&argc, &argv);
diff --git a/themes/Makefile.in b/themes/Makefile.in
index d640c94752c71a4dbe3ec4aba2ca496b8330d01f..3105a768bd676f4200c1c4920f7a6fe1b6a1425a 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.5 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -181,6 +181,7 @@ SUBDIRS = \
 	tgc
 
 subdir = themes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -292,9 +293,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/bbs/Makefile.in b/themes/bbs/Makefile.in
index 363afa59e512298a88c23daa2cc2a183cdc62732..706826b910a4e388304c10bb10e0411b1b5a8fd2 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/curve/Makefile.in b/themes/curve/Makefile.in
index e3398cddcea676aad80d3b761449780886e3f679..81ee1fd5967c8bd348db5895d6c68b635d1f1282 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index 01fec7f8a264ac32a91c997239b919edd8616c99..48f6ad09bc1f38dcb02494f85662f466a26ec6dc 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.5 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 =
@@ -254,7 +255,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index 2b910357775eaa9adefc32c241660c0c16b30842..48f0d457358df84d68c2a1d305f6773c4f1cad5b 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.5 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 =
@@ -307,7 +308,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/exocet/Makefile.in b/themes/exocet/Makefile.in
index 82a9e9ef85f48847d3fdab2eb21dcc04b9ef8c15..e34e6adf937d39a63a15bea90d86cdb5225aa795 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/meenee/Makefile.in b/themes/meenee/Makefile.in
index 539c6abcb9c2825b7c406ed8fa999d56acc697a1..04efd1690204a8203ebbf6f08f0c6cff924241da 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/microcurve/Makefile.in b/themes/microcurve/Makefile.in
index bfc06b195b45308de6583b40f8cc9d5090dd924d..4803eb3e2d40557f2c1f89a1edfe2023929e537c 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/microdeck/Makefile.in b/themes/microdeck/Makefile.in
index 8b18d7975f0c50d8ddf798e8ad3dcf98542793b2..7140d7c142703b12ab0cb1692a37533535a5da7d 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.5 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 =
@@ -307,7 +308,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/microdeck2/Makefile.in b/themes/microdeck2/Makefile.in
index a915f6784d9a8d77fc074d38cd9d024d49c6dd90..ba194096442f95124e5a32a81b4d1a68a87c3d6b 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/microdeck3/Makefile.in b/themes/microdeck3/Makefile.in
index 2b33398cc3ec30bc027778edd00433e528c1d24a..301ad644918dfdf1c6c40b256e96a2ed7f16593b 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
diff --git a/themes/tgc/Makefile.in b/themes/tgc/Makefile.in
index 6e3af323879ed6a71025205eac1e01c968d927db..97e618684cb4187d95309d5a77218b9e8784d8e6 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.5 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 =
@@ -298,7 +299,6 @@ all-am: Makefile $(DATA)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(themedir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am