--- kdemultimedia-3.5.0.orig/kaboodle/pics/Makefile.in
+++ kdemultimedia-3.5.0/kaboodle/pics/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -420,7 +423,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -458,9 +461,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kaboodle/actions/Makefile.in
+++ kdemultimedia-3.5.0/kaboodle/actions/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kaboodle/Makefile.in
+++ kdemultimedia-3.5.0/kaboodle/Makefile.in
@@ -282,6 +282,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -535,7 +538,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -573,9 +576,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/libkcddb/kcmcddb/Makefile.in
+++ kdemultimedia-3.5.0/libkcddb/kcmcddb/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -487,7 +490,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -525,9 +528,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/libkcddb/test/Makefile.in
+++ kdemultimedia-3.5.0/libkcddb/test/Makefile.in
@@ -291,6 +291,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -549,7 +552,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,9 +590,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkPROGRAMS:
--- kdemultimedia-3.5.0.orig/libkcddb/Makefile.in
+++ kdemultimedia-3.5.0/libkcddb/Makefile.in
@@ -270,6 +270,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -525,7 +528,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -563,9 +566,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/app/Makefile.in
+++ kdemultimedia-3.5.0/noatun/app/Makefile.in
@@ -249,6 +249,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -486,7 +489,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -524,9 +527,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/pics/Makefile.in
+++ kdemultimedia-3.5.0/noatun/pics/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/library/noatun/Makefile.in
+++ kdemultimedia-3.5.0/noatun/library/noatun/Makefile.in
@@ -207,6 +207,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/library/noatuntags/Makefile.in
+++ kdemultimedia-3.5.0/noatun/library/noatuntags/Makefile.in
@@ -237,6 +237,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/library/noatunarts/Makefile.in
+++ kdemultimedia-3.5.0/noatun/library/noatunarts/Makefile.in
@@ -253,6 +253,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -503,7 +506,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -541,9 +544,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/library/Makefile.in
+++ kdemultimedia-3.5.0/noatun/library/Makefile.in
@@ -292,6 +292,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -572,7 +575,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -610,9 +613,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/marquis/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/marquis/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -483,7 +486,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -521,9 +524,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/metatag/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/metatag/Makefile.in
@@ -245,6 +245,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -484,7 +487,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -522,9 +525,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/keyz/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/keyz/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -478,7 +481,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -516,9 +519,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/voiceprint/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/voiceprint/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/skins/winamp/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -436,7 +439,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -474,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/skins/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/skins/Makefile.in
@@ -212,6 +212,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -438,7 +441,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -476,9 +479,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/mimetypes/interface/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -432,7 +435,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -470,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/mimetypes/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/mimetypes/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -436,7 +439,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -474,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/vis/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/vis/Makefile.in
@@ -243,6 +243,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -492,7 +495,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -530,9 +533,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/winskin/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/winskin/Makefile.in
@@ -265,6 +265,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -562,7 +565,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -600,9 +603,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/excellent/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/excellent/Makefile.in
@@ -245,6 +245,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -488,7 +491,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +529,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/net/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/net/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -478,7 +481,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -516,9 +519,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -438,7 +441,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -476,9 +479,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -435,7 +438,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -473,9 +476,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -435,7 +438,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -473,9 +476,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -435,7 +438,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -473,9 +476,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/skins/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -436,7 +439,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -474,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kjofol-skin/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kjofol-skin/Makefile.in
@@ -266,6 +266,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -537,7 +540,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -575,9 +578,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/simple/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/simple/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -484,7 +487,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -522,9 +525,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/infrared/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/infrared/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -483,7 +486,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -521,9 +524,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kaiman/skins/circle/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kaiman/skins/k9/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -439,7 +442,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -477,9 +480,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kaiman/skins/car-preset/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -438,7 +441,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -476,9 +479,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kaiman/skins/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kaiman/skins/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -437,7 +440,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -475,9 +478,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/modules/kaiman/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/kaiman/Makefile.in
@@ -260,6 +260,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -509,7 +512,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -547,9 +550,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/noatunui/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/noatunui/Makefile.in
@@ -245,6 +245,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -485,7 +488,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -523,9 +526,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/monoscope/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/monoscope/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -480,7 +483,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -518,9 +521,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/htmlexport/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/htmlexport/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -480,7 +483,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -518,9 +521,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/artseffects/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/artseffects/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/dcopiface/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/dcopiface/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -483,7 +486,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -521,9 +524,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/splitplaylist/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/splitplaylist/Makefile.in
@@ -249,6 +249,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -488,7 +491,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +529,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/systray/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/systray/Makefile.in
@@ -246,6 +246,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -488,7 +491,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -526,9 +529,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/noatun/modules/Makefile.in
+++ kdemultimedia-3.5.0/noatun/modules/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/noatun/Makefile.in
+++ kdemultimedia-3.5.0/noatun/Makefile.in
@@ -39,7 +39,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-update_PROGRAMS = noatun20update$(EXEEXT)
+kconf_PROGRAMS = noatun20update$(EXEEXT)
 subdir = noatun
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -50,10 +50,10 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(presetsdir)" \
+am__installdirs = "$(DESTDIR)$(kconfdir)" "$(DESTDIR)$(presetsdir)" \
 	"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"
-updatePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(update_PROGRAMS)
+kconfPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(kconf_PROGRAMS)
 am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
 #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
 #>+ 1
@@ -254,6 +254,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -482,6 +485,7 @@
 presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
 updatedir = $(kde_datadir)/kconf_update
 update_DATA = noatun.upd
+kconfdir = $(libdir)/kconf_update_bin
 noatun20update_SOURCES = noatun20update.cpp
 noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 noatun20update_LDADD = $(LIB_QT)
@@ -491,7 +495,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -529,34 +533,34 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-updatePROGRAMS: $(update_PROGRAMS)
+install-kconfPROGRAMS: $(kconf_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
-	@list='$(update_PROGRAMS)'; for p in $$list; do \
+	test -z "$(kconfdir)" || $(mkdir_p) "$(DESTDIR)$(kconfdir)"
+	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(updatePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(updatePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(updatedir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(kconfPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(kconfdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(kconfPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(kconfdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-updatePROGRAMS:
+uninstall-kconfPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(update_PROGRAMS)'; for p in $$list; do \
+	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(kconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(kconfdir)/$$f"; \
 	done
 
-clean-updatePROGRAMS:
-	@list='$(update_PROGRAMS)'; for p in $$list; do \
+clean-kconfPROGRAMS:
+	@list='$(kconf_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
@@ -834,7 +838,7 @@
 all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(presetsdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
+	for dir in "$(DESTDIR)$(kconfdir)" "$(DESTDIR)$(presetsdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -865,10 +869,10 @@
 #>+ 1
 clean: kde-rpo-clean  clean-recursive
 
-#>- clean-am: clean-generic clean-libtool clean-updatePROGRAMS \
+#>- clean-am: clean-generic clean-kconfPROGRAMS clean-libtool \
 #>- 	mostlyclean-am
 #>+ 2
-clean-am: clean-bcheck  clean-generic clean-libtool clean-updatePROGRAMS \
+clean-am: clean-bcheck  clean-generic clean-kconfPROGRAMS clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -887,11 +891,11 @@
 
 info-am:
 
-#>- install-data-am: install-presetsDATA install-updateDATA \
-#>- 	install-updatePROGRAMS install-xdg_appsDATA
+#>- install-data-am: install-kconfPROGRAMS install-presetsDATA \
+#>- 	install-updateDATA install-xdg_appsDATA
 #>+ 2
-install-data-am: install-kde-icons  install-presetsDATA install-updateDATA \
-	install-updatePROGRAMS install-xdg_appsDATA
+install-data-am: install-kde-icons  install-kconfPROGRAMS install-presetsDATA \
+	install-updateDATA install-xdg_appsDATA
 
 install-exec-am:
 
@@ -919,32 +923,33 @@
 
 ps-am:
 
-#>- uninstall-am: uninstall-info-am uninstall-presetsDATA \
-#>- 	uninstall-updateDATA uninstall-updatePROGRAMS \
+#>- uninstall-am: uninstall-info-am uninstall-kconfPROGRAMS \
+#>- 	uninstall-presetsDATA uninstall-updateDATA \
 #>- 	uninstall-xdg_appsDATA
 #>+ 3
-uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-presetsDATA \
-	uninstall-updateDATA uninstall-updatePROGRAMS \
+uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-kconfPROGRAMS \
+	uninstall-presetsDATA uninstall-updateDATA \
 	uninstall-xdg_appsDATA
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive \
-	clean-updatePROGRAMS ctags ctags-recursive distclean \
+	clean clean-generic clean-kconfPROGRAMS clean-libtool \
+	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-presetsDATA install-strip \
-	install-updateDATA install-updatePROGRAMS install-xdg_appsDATA \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
+	install-info-am install-kconfPROGRAMS install-man \
+	install-presetsDATA install-strip install-updateDATA \
+	install-xdg_appsDATA installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-presetsDATA uninstall-updateDATA \
-	uninstall-updatePROGRAMS uninstall-xdg_appsDATA
+	uninstall-info-am uninstall-kconfPROGRAMS \
+	uninstall-presetsDATA uninstall-updateDATA \
+	uninstall-xdg_appsDATA
 
 
 messages:
--- kdemultimedia-3.5.0.orig/doc/artsbuilder/images/Makefile.in
+++ kdemultimedia-3.5.0/doc/artsbuilder/images/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/artsbuilder/Makefile.in
+++ kdemultimedia-3.5.0/doc/artsbuilder/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/kaboodle/Makefile.in
+++ kdemultimedia-3.5.0/doc/kaboodle/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/kmid/Makefile.in
+++ kdemultimedia-3.5.0/doc/kmid/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/krec/Makefile.in
+++ kdemultimedia-3.5.0/doc/krec/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/kscd/Makefile.in
+++ kdemultimedia-3.5.0/doc/kscd/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/noatun/Makefile.in
+++ kdemultimedia-3.5.0/doc/noatun/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/kmix/Makefile.in
+++ kdemultimedia-3.5.0/doc/kmix/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/juk/Makefile.in
+++ kdemultimedia-3.5.0/doc/juk/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/kioslave/Makefile.in
+++ kdemultimedia-3.5.0/doc/kioslave/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/doc/Makefile.in
+++ kdemultimedia-3.5.0/doc/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/oggvorbis_artsplugin/Makefile.in
+++ kdemultimedia-3.5.0/oggvorbis_artsplugin/Makefile.in
@@ -245,6 +245,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -485,7 +488,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -523,9 +526,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/tools/pics/Makefile.in
+++ kdemultimedia-3.5.0/arts/tools/pics/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -420,7 +423,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -458,9 +461,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/tools/Makefile.in
+++ kdemultimedia-3.5.0/arts/tools/Makefile.in
@@ -291,6 +291,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -589,7 +592,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -627,9 +630,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/midi/mcopclass/Makefile.in
+++ kdemultimedia-3.5.0/arts/midi/mcopclass/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -431,7 +434,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -469,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/midi/Makefile.in
+++ kdemultimedia-3.5.0/arts/midi/Makefile.in
@@ -303,6 +303,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -571,7 +574,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -609,9 +612,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/runtime/Makefile.in
+++ kdemultimedia-3.5.0/arts/runtime/Makefile.in
@@ -255,6 +255,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -509,7 +512,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -547,9 +550,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/gui/kde/mcopclass/Makefile.in
+++ kdemultimedia-3.5.0/arts/gui/kde/mcopclass/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -435,7 +438,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -473,9 +476,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/gui/kde/Makefile.in
+++ kdemultimedia-3.5.0/arts/gui/kde/Makefile.in
@@ -285,6 +285,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -545,7 +548,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -583,9 +586,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/gui/common/Makefile.in
+++ kdemultimedia-3.5.0/arts/gui/common/Makefile.in
@@ -247,6 +247,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -500,7 +503,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -538,9 +541,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/gui/Makefile.in
+++ kdemultimedia-3.5.0/arts/gui/Makefile.in
@@ -209,6 +209,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -437,7 +440,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -475,9 +478,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/builder/pics/Makefile.in
+++ kdemultimedia-3.5.0/arts/builder/pics/Makefile.in
@@ -217,6 +217,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -452,7 +455,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -490,9 +493,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/builder/Makefile.in
+++ kdemultimedia-3.5.0/arts/builder/Makefile.in
@@ -274,6 +274,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -530,7 +533,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -568,9 +571,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/modules/effects/freeverb/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/effects/freeverb/Makefile.in
@@ -227,6 +227,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -455,7 +458,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -493,9 +496,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/arts/modules/effects/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/effects/Makefile.in
@@ -283,6 +283,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -572,7 +575,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -610,9 +613,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/modules/synth/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/synth/Makefile.in
@@ -288,6 +288,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -570,7 +573,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -608,9 +611,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/modules/mixers/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/mixers/Makefile.in
@@ -258,6 +258,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -538,7 +541,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -576,9 +579,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/modules/common/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/common/Makefile.in
@@ -260,6 +260,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -531,7 +534,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -569,9 +572,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/modules/Makefile.in
+++ kdemultimedia-3.5.0/arts/modules/Makefile.in
@@ -265,6 +265,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -541,7 +544,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -579,9 +582,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/arts/examples/Makefile.in
+++ kdemultimedia-3.5.0/arts/examples/Makefile.in
@@ -206,6 +206,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -501,7 +504,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -539,9 +542,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/arts/Makefile.in
+++ kdemultimedia-3.5.0/arts/Makefile.in
@@ -209,6 +209,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -437,7 +440,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -475,9 +478,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/plugins/vorbis/Makefile.in
@@ -243,6 +243,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/plugins/flac/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/plugins/flac/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -470,7 +473,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -508,9 +511,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/plugins/wav/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/plugins/wav/Makefile.in
@@ -238,6 +238,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -474,7 +477,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -512,9 +515,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/plugins/lame/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/plugins/lame/Makefile.in
@@ -242,6 +242,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -480,7 +483,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -518,9 +521,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/plugins/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/plugins/Makefile.in
@@ -256,6 +256,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -491,7 +494,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -529,9 +532,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/kcmaudiocd/Makefile.in
@@ -241,6 +241,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -476,7 +479,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -514,9 +517,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/audiocd/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/audiocd/Makefile.in
@@ -262,6 +262,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -506,7 +509,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -544,9 +547,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kioslave/Makefile.in
+++ kdemultimedia-3.5.0/kioslave/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -437,7 +440,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -475,9 +478,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/input/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/input/Makefile.in
@@ -250,6 +250,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -507,7 +510,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -545,9 +548,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/mpgplayer/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/mpgplayer/Makefile.in
@@ -237,6 +237,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -468,7 +471,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -506,9 +509,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/output/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/output/Makefile.in
@@ -248,6 +248,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -496,7 +499,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -534,9 +537,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/oggvorbis/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/oggvorbis/Makefile.in
@@ -242,6 +242,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -477,7 +480,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -515,9 +518,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/yuv/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/yuv/Makefile.in
@@ -237,6 +237,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -469,7 +472,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -507,9 +510,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/decoder/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/decoder/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -485,7 +488,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -523,9 +526,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/splay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/splay/Makefile.in
@@ -250,6 +250,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -507,7 +510,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -545,9 +548,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/tplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/tplay/Makefile.in
@@ -232,6 +232,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -465,7 +468,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -503,9 +506,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/frame/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/frame/Makefile.in
@@ -244,6 +244,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -485,7 +488,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -523,9 +526,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/render/dither/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/render/dither/Makefile.in
@@ -238,6 +238,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -482,7 +485,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -520,9 +523,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/render/sdl/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/render/sdl/Makefile.in
@@ -232,6 +232,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -462,7 +465,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -500,9 +503,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/render/dither2YUV/Makefile.in
@@ -234,6 +234,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -469,7 +472,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -507,9 +510,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/render/x11/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/render/x11/Makefile.in
@@ -234,6 +234,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/render/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/render/Makefile.in
@@ -258,6 +258,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -501,7 +504,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -539,9 +542,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/file/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/file/Makefile.in
@@ -237,6 +237,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -469,7 +472,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -507,9 +510,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/mmx/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/mmx/Makefile.in
@@ -233,6 +233,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -466,7 +469,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -504,9 +507,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/audio/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/audio/Makefile.in
@@ -232,6 +232,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -467,7 +470,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -505,9 +508,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/abstract/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/abstract/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/util/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/util/Makefile.in
@@ -258,6 +258,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -504,7 +507,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -542,9 +545,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/mpegplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/mpegplay/Makefile.in
@@ -265,6 +265,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -532,7 +535,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .S .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -570,9 +573,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/mpeglib/lib/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/lib/Makefile.in
@@ -255,6 +255,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -506,7 +509,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -544,9 +547,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafyuv/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafvorbis/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -472,7 +475,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -510,9 +513,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafxplayer/Makefile.in
@@ -247,6 +247,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -501,7 +504,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -539,9 +542,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafcore/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafcore/Makefile.in
@@ -248,6 +248,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -509,7 +512,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -547,9 +550,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafsplay/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafmpgplay/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -471,7 +474,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -509,9 +512,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yaftplay/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -470,7 +473,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -508,9 +511,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/yafcdda/Makefile.in
@@ -235,6 +235,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -470,7 +473,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -508,9 +511,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib/example/yaf/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/yaf/Makefile.in
@@ -212,6 +212,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -441,7 +444,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -479,9 +482,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/mpeglib/example/cddaplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/cddaplay/Makefile.in
@@ -231,6 +231,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -464,7 +467,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -502,9 +505,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
--- kdemultimedia-3.5.0.orig/mpeglib/example/splay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/splay/Makefile.in
@@ -236,6 +236,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -475,7 +478,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -513,9 +516,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
--- kdemultimedia-3.5.0.orig/mpeglib/example/mpgplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/mpgplay/Makefile.in
@@ -231,6 +231,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -465,7 +468,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -503,9 +506,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
--- kdemultimedia-3.5.0.orig/mpeglib/example/tplay/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/tplay/Makefile.in
@@ -231,6 +231,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -465,7 +468,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -503,9 +506,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
--- kdemultimedia-3.5.0.orig/mpeglib/example/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/example/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -436,7 +439,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -474,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/mpeglib/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib/Makefile.in
@@ -213,6 +213,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -442,7 +445,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -480,9 +483,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/mpg123_artsplugin/mpg123/Makefile.in
+++ kdemultimedia-3.5.0/mpg123_artsplugin/mpg123/Makefile.in
@@ -306,6 +306,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -561,7 +564,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj .s
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -599,9 +602,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpg123_artsplugin/Makefile.in
+++ kdemultimedia-3.5.0/mpg123_artsplugin/Makefile.in
@@ -269,6 +269,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -510,7 +513,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -548,9 +551,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kscd/kscdmagic/Makefile.in
+++ kdemultimedia-3.5.0/kscd/kscdmagic/Makefile.in
@@ -257,6 +257,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -502,7 +505,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -540,9 +543,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kscd/libwm/audio/Makefile.in
+++ kdemultimedia-3.5.0/kscd/libwm/audio/Makefile.in
@@ -219,6 +219,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -448,7 +451,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -486,9 +489,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/kscd/libwm/Makefile.in
+++ kdemultimedia-3.5.0/kscd/libwm/Makefile.in
@@ -250,6 +250,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -489,7 +492,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -527,9 +530,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/kscd/bitmaps/Makefile.in
+++ kdemultimedia-3.5.0/kscd/bitmaps/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -420,7 +423,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -458,9 +461,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kscd/Makefile.in
+++ kdemultimedia-3.5.0/kscd/Makefile.in
@@ -279,6 +279,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -549,7 +552,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -587,9 +590,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
--- kdemultimedia-3.5.0.orig/krec/pics/Makefile.in
+++ kdemultimedia-3.5.0/krec/pics/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/krec/ogg_export/Makefile.in
+++ kdemultimedia-3.5.0/krec/ogg_export/Makefile.in
@@ -238,6 +238,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/krec/mp3_export/Makefile.in
+++ kdemultimedia-3.5.0/krec/mp3_export/Makefile.in
@@ -238,6 +238,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/krec/Makefile.in
+++ kdemultimedia-3.5.0/krec/Makefile.in
@@ -319,6 +319,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -619,7 +622,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -657,9 +660,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kmid/pics/Makefile.in
+++ kdemultimedia-3.5.0/kmid/pics/Makefile.in
@@ -194,6 +194,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -421,7 +424,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -459,9 +462,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kmid/maps/Makefile.in
+++ kdemultimedia-3.5.0/kmid/maps/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -432,7 +435,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -470,9 +473,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kmid/examples/Makefile.in
+++ kdemultimedia-3.5.0/kmid/examples/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -434,7 +437,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -472,9 +475,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kmid/Makefile.in
+++ kdemultimedia-3.5.0/kmid/Makefile.in
@@ -293,6 +293,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -568,7 +571,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -606,9 +609,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/juk/pics/Makefile.in
+++ kdemultimedia-3.5.0/juk/pics/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -431,7 +434,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -469,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/juk/Makefile.in
+++ kdemultimedia-3.5.0/juk/Makefile.in
@@ -321,6 +321,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -712,7 +715,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -750,9 +753,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kappfinder-data/Makefile.in
+++ kdemultimedia-3.5.0/kappfinder-data/Makefile.in
@@ -209,6 +209,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -453,13 +456,13 @@
 EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
 xdg_directory_DATA = kde-multimedia-music.directory
 xdg_mergedmenu_DATA = kde-multimedia-music.menu
-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
+xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
 #>- all: all-am
 #>+ 1
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -497,9 +500,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/akode_artsplugin/Makefile.in
+++ kdemultimedia-3.5.0/akode_artsplugin/Makefile.in
@@ -253,6 +253,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -502,7 +505,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -540,9 +543,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kaudiocreator/icons/Makefile.in
+++ kdemultimedia-3.5.0/kaudiocreator/icons/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -431,7 +434,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -469,9 +472,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kaudiocreator/Makefile.in
+++ kdemultimedia-3.5.0/kaudiocreator/Makefile.in
@@ -273,6 +273,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -533,7 +536,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -571,9 +574,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/mpeglib_artsplug/Makefile.in
+++ kdemultimedia-3.5.0/mpeglib_artsplug/Makefile.in
@@ -278,6 +278,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -581,7 +584,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -619,9 +622,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kmix/pics/Makefile.in
+++ kdemultimedia-3.5.0/kmix/pics/Makefile.in
@@ -204,6 +204,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -440,7 +443,7 @@
 all: docs-am  all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -478,9 +481,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/kmix/Makefile.in
+++ kdemultimedia-3.5.0/kmix/Makefile.in
@@ -324,6 +324,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -622,7 +625,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -660,9 +663,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/avi/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/avi/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/mp3/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/mp3/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/mpc/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/mpc/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/sid/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/sid/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/theora/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/theora/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/m3u/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/m3u/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/au/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/au/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/flac/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/flac/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/mpeg/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/mpeg/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/ogg/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/ogg/Makefile.in
@@ -251,6 +251,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -492,7 +495,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -530,9 +533,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/wav/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/wav/Makefile.in
@@ -240,6 +240,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -481,7 +484,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -519,9 +522,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/kfile-plugins/Makefile.in
+++ kdemultimedia-3.5.0/kfile-plugins/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -443,7 +446,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -481,9 +484,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/audiofile_artsplugin/Makefile.in
+++ kdemultimedia-3.5.0/audiofile_artsplugin/Makefile.in
@@ -245,6 +245,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -486,7 +489,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -524,9 +527,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in
+++ kdemultimedia-3.5.0/xine_artsplugin/tools/thumbnail/Makefile.in
@@ -246,6 +246,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -484,7 +487,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -522,9 +525,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/xine_artsplugin/tools/Makefile.in
+++ kdemultimedia-3.5.0/xine_artsplugin/tools/Makefile.in
@@ -210,6 +210,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -436,7 +439,7 @@
 all: docs-am  all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -474,9 +477,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- kdemultimedia-3.5.0.orig/xine_artsplugin/Makefile.in
+++ kdemultimedia-3.5.0/xine_artsplugin/Makefile.in
@@ -267,6 +267,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -509,7 +512,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -547,9 +550,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
--- kdemultimedia-3.5.0.orig/acinclude.m4
+++ kdemultimedia-3.5.0/acinclude.m4
@@ -1689,15 +1689,6 @@
        KDE_USE_CLOSURE_TRUE="#"
        KDE_USE_CLOSURE_FALSE=""
        KDE_NO_UNDEFINED=""
-       case $host in 
-         *-*-linux-gnu)
-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-		[KDE_NO_UNDEFINED=""])],
-	    [KDE_NO_UNDEFINED=""])
-           ;;
-       esac
   fi
   AC_SUBST(KDE_USE_CLOSURE_TRUE)
   AC_SUBST(KDE_USE_CLOSURE_FALSE)
@@ -2144,9 +2135,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 AC_TRY_COMPILE([
 $2
 ],
@@ -3351,73 +3339,73 @@
 
 AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
 [
-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-
-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-
-  if test "x$GXX" = "xyes"; then
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_EGREP_CPP(
-       [GCC visibility push],
-       [ #include <exception> 
-       ], 
-    [
-      AC_MSG_RESULT(yes)
-      kde_stdc_visibility_patched=yes ],
-    [ 
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
-                   visibility support. Disabling -fvisibility=hidden])
-
-      kde_stdc_visibility_patched=no ])
-
-    AC_LANG_RESTORE
-
-    kde_have_gcc_visibility=no
-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-    [
-      kde_have_gcc_visibility=yes
-      dnl the whole toolchain is just a mess, gcc is just too buggy
-      dnl to handle STL with visibility enabled. Lets reconsider 
-      dnl when gcc 4.2 is out or when things get fixed in the compiler.
-      dnl Contact mueller@kde.org for details.
-      AC_ARG_ENABLE(gcc-hidden-visibility,
-        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
-          [kde_have_gcc_visibility=$enableval],
-          [kde_have_gcc_visibility=no])
-
-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-        [
-          AC_LANG_SAVE
-          AC_LANG_CPLUSPLUS
-
-          safe_CXXFLAGS=$CXXFLAGS
-          CXXFLAGS="$CXXFLAGS $all_includes"
-
-          AC_TRY_COMPILE(
-          [
-#include <qglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
-#endif
-          ], [/* elvis is alive */],
-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-
-          CXXFLAGS=$safe_CXXFLAGS
-          AC_LANG_RESTORE
-        ]
-      )
-
-      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-        KDE_CHECK_VISIBILITY_GCC_BUG
-        HAVE_GCC_VISIBILITY=1
-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-      fi
-    ])
-  fi
+dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+dnl
+dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+dnl
+dnl  if test "x$GXX" = "xyes"; then
+dnl    AC_LANG_SAVE
+dnl    AC_LANG_CPLUSPLUS
+dnl    AC_EGREP_CPP(
+dnl       [GCC visibility push],
+dnl       [ #include <exception> 
+dnl       ], 
+dnl    [
+dnl      AC_MSG_RESULT(yes)
+dnl      kde_stdc_visibility_patched=yes ],
+dnl    [ 
+dnl      AC_MSG_RESULT(no)
+dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+dnl                   visibility support. Disabling -fvisibility=hidden])
+dnl
+dnl      kde_stdc_visibility_patched=no ])
+dnl
+dnl    AC_LANG_RESTORE
+dnl
+dnl    kde_have_gcc_visibility=no
+dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+dnl    [
+dnl      kde_have_gcc_visibility=yes
+dnl      dnl the whole toolchain is just a mess, gcc is just too buggy
+dnl      dnl to handle STL with visibility enabled. Lets reconsider 
+dnl      dnl when gcc 4.2 is out or when things get fixed in the compiler.
+dnl      dnl Contact mueller@kde.org for details.
+dnl      AC_ARG_ENABLE(gcc-hidden-visibility,
+dnl        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
+dnl          [kde_have_gcc_visibility=$enableval],
+dnl          [kde_have_gcc_visibility=no])
+dnl
+dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+dnl        [
+dnl          AC_LANG_SAVE
+dnl          AC_LANG_CPLUSPLUS
+dnl
+dnl          safe_CXXFLAGS=$CXXFLAGS
+dnl          CXXFLAGS="$CXXFLAGS $all_includes"
+dnl
+dnl          AC_TRY_COMPILE(
+dnl          [
+dnl#include <qglobal.h>
+dnl#if Q_EXPORT - 0 != 0
+dnl/* if this compiles, then Q_EXPORT is undefined */
+dnl/* if Q_EXPORT is nonempty, this will break compilation */
+dnl#endif
+dnl          ], [/* elvis is alive */],
+dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+dnl
+dnl          CXXFLAGS=$safe_CXXFLAGS
+dnl          AC_LANG_RESTORE
+dnl        ]
+dnl      )
+dnl
+dnl      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+dnl        KDE_CHECK_VISIBILITY_GCC_BUG
+dnl        HAVE_GCC_VISIBILITY=1
+dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+dnl      fi
+dnl    ])
+dnl  fi
 ])
 
 AC_DEFUN([KDE_ADD_DEPENDENCIES],
@@ -5917,30 +5905,15 @@
   fi
 ])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 ## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
+## This file is free software; the Free Software Foundation gives
+## unlimited permission to copy and/or distribute it, with or without
+## modifications, as long as this notice is preserved.
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6000,7 +5973,7 @@
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
 # Prevent multiple expansion
@@ -6050,7 +6023,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -6070,7 +6043,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -6118,6 +6091,8 @@
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -6163,6 +6138,48 @@
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -6235,15 +6252,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -6412,14 +6429,13 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
-      LINUX_64_MODE="32"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -6431,7 +6447,6 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
@@ -6496,7 +6511,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -6506,8 +6521,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -6533,11 +6550,16 @@
    LDFLAGS="$LDFLAGS $3"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
+       $SED '/^$/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
      else
        $2=yes
      fi
@@ -6561,7 +6583,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -6590,20 +6612,53 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -6699,7 +6754,7 @@
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
@@ -6753,7 +6808,7 @@
     lt_cv_dlopen_self=yes
     ])
    ;;
-    
+
   *)
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
@@ -6842,20 +6897,13 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -6867,13 +6915,18 @@
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -6932,8 +6985,8 @@
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -6990,7 +7043,7 @@
    *)
   AC_MSG_RESULT([no])
     ;;
-  esac  
+  esac
 fi
 ])# AC_LIBTOOL_SYS_LIB_STRIP
 
@@ -7003,7 +7056,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -7013,7 +7066,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -7078,7 +7144,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -7087,7 +7153,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7103,7 +7169,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -7115,7 +7181,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -7145,7 +7212,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -7168,7 +7235,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -7191,7 +7258,7 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
+kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -7203,8 +7270,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -7222,7 +7298,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -7249,9 +7325,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -7266,7 +7342,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -7277,7 +7353,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -7339,22 +7415,19 @@
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -7364,6 +7437,30 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -7373,7 +7470,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -7402,7 +7499,11 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -7422,7 +7523,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -7568,7 +7669,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  AC_LIBTOOL_LANG_CXX_CONFIG
 	else
 	  tagname=""
@@ -7630,7 +7733,7 @@
 
 # AC_LIBTOOL_WIN32_DLL
 # --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 ])# AC_LIBTOOL_WIN32_DLL
@@ -7804,7 +7907,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -7914,7 +8017,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -7946,7 +8049,7 @@
 AC_DEFUN([AC_PROG_LD_GNU],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -7973,6 +8076,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -8006,44 +8118,36 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  lt_cv_deplibs_check_method=pass_all
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
-  
+
 mingw* | pw32*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -8059,7 +8163,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -8076,42 +8180,21 @@
   ;;
 
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -8130,19 +8213,14 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -8152,7 +8230,6 @@
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -8260,13 +8337,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl convenience library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case $enable_ltdl_convenience in
@@ -8285,13 +8362,13 @@
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl installable library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -8329,10 +8406,21 @@
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
 
+# _LT_AC_PROG_CXXCPP
+# ---------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
 # AC_LIBTOOL_F77
 # --------------
@@ -8405,6 +8493,10 @@
 
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 #
 # Check for any special shared library compilation flags.
 #
@@ -8418,7 +8510,7 @@
 fi
 if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
   else
     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
@@ -8459,7 +8551,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -8468,48 +8560,11 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.[012])
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi  
-    ;;  
+    ;;
 esac
 AC_MSG_RESULT([$enable_shared])
 
@@ -8534,7 +8589,7 @@
 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 [AC_LANG_PUSH(C++)
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -8563,7 +8618,7 @@
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -8578,6 +8633,10 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -8599,7 +8658,7 @@
 CC=${CXX-"c++"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -8617,8 +8676,8 @@
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -8644,7 +8703,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -8674,8 +8733,22 @@
       exp_sym_flag='-Bexport'
       no_entry_flag=""
     else
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
       exp_sym_flag='-bexport'
       no_entry_flag='-bnoentry'
     fi
@@ -8692,7 +8765,7 @@
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -8713,6 +8786,9 @@
 	fi
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -8721,15 +8797,16 @@
 	shared_flag='-G'
       else
 	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='-qmkshrobj ${wl}-G'
+	  shared_flag='${wl}-G'
 	else
-	  shared_flag='-qmkshrobj'
+	  shared_flag='${wl}-bM:SRE'
 	fi
       fi
     fi
 
-    # Let the compiler handle the export list.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
     if test "$aix_use_runtimelinking" = yes; then
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
@@ -8738,13 +8815,12 @@
       _LT_AC_SYS_LIBPATH_AIX
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	_LT_AC_SYS_LIBPATH_AIX
@@ -8758,8 +8834,8 @@
 	# Exported symbols can be pulled into shared objects from archives
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
@@ -8772,16 +8848,17 @@
     esac
     ;;
 
+
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
     _LT_AC_TAGVAR(always_export_symbols, $1)=no
     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -8790,70 +8867,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.[012])
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8864,14 +8952,14 @@
 	;;
     esac
     ;;
-  freebsd[12]*)
+  freebsd[[12]]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -8888,12 +8976,12 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
@@ -8902,11 +8990,11 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
         # FIXME: insert proper C++ library support
         _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8916,7 +9004,7 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*)
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -8932,7 +9020,7 @@
         ;;
       esac
     fi
-    case "$host_cpu" in
+    case $host_cpu in
     hppa*64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -8953,17 +9041,17 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      aCC)
-	case "$host_cpu" in
+      aCC*)
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	esac
 	# Commands to make compiler produce verbose output that lists
@@ -8979,12 +9067,12 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    ia64*|hppa*64*)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
 	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    esac
 	  fi
@@ -8997,9 +9085,9 @@
     ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -9010,9 +9098,9 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
 	fi
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -9023,14 +9111,14 @@
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	# Commands to make compiler produce verbose output that lists
 	# what "hidden" libraries, object files and flags are used when
 	# linking a shared library.
@@ -9048,20 +9136,44 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
 	runpath_var=LD_RUN_PATH
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -9089,7 +9201,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -9099,7 +9211,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -9110,15 +9222,31 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9128,14 +9256,14 @@
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9153,7 +9281,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9172,13 +9300,13 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9187,17 +9315,17 @@
 	# the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -9216,7 +9344,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -9240,7 +9368,7 @@
   sco*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -9252,12 +9380,12 @@
     ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9270,36 +9398,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -9307,9 +9432,9 @@
 	# in the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
 	# The C++ compiler must be used to create the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -9319,9 +9444,9 @@
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -9330,9 +9455,9 @@
 	  else
 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -9350,7 +9475,7 @@
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -9460,7 +9585,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -9500,7 +9625,7 @@
        fi
        ;;
 
-    *.$objext|*.$libext)
+    *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
        if test "$p" = "conftest.$objext"; then
@@ -9536,6 +9661,21 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+esac
+])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -9586,12 +9726,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
@@ -9601,7 +9745,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -9609,8 +9753,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -9661,20 +9807,27 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
@@ -9721,11 +9874,16 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
@@ -9751,11 +9909,12 @@
   # without removal of \ escapes.
   if test -n "${ZSH_VERSION+set}" ; then
     setopt NO_GLOB_SUBST
-  fi  
+  fi
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -9805,7 +9964,7 @@
     _LT_AC_TAGVAR(archive_cmds, $1) | \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
     extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -9871,11 +10030,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -9906,6 +10065,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -9936,7 +10101,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -9967,7 +10132,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -9982,7 +10147,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -10211,7 +10376,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 ])# AC_LIBTOOL_CONFIG
 
@@ -10253,9 +10421,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -10277,6 +10442,13 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
   ;;
@@ -10284,7 +10456,7 @@
   symcode='[[BCDEGQRST]]'
   ;;
 solaris* | sysv5*)
-  symcode='[[BDT]]'
+  symcode='[[BDRT]]'
   ;;
 sysv4)
   symcode='[[DFNSTU]]'
@@ -10302,14 +10474,17 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode='[[ABCDGISTW]]' ;;
+  symcode='[[ABCDGIRSTW]]' ;;
 esac
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -10473,7 +10648,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -10498,18 +10673,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -10517,22 +10702,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -10547,7 +10732,7 @@
 	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -10558,18 +10743,24 @@
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;; 
-	  cxx)
+	    ;;
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -10586,25 +10777,25 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -10620,7 +10811,7 @@
 	;;
       sco*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  *)
@@ -10629,13 +10820,13 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	    ;;
@@ -10645,12 +10836,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -10660,7 +10851,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -10731,7 +10922,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -10757,6 +10948,16 @@
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -10768,7 +10969,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -10792,12 +10993,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
       ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
@@ -10818,9 +11026,14 @@
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -10842,6 +11055,11 @@
       fi
       ;;
 
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
     uts4*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -10869,7 +11087,7 @@
     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -10902,7 +11120,10 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -10928,7 +11149,7 @@
   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
   _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
   _LT_AC_TAGVAR(always_export_symbols, $1)=no
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   # include_expsyms should be a list of space-separated symbols to be *always*
@@ -10945,7 +11166,8 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
-
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
   case $host_os in
   cygwin* | mingw* | pw32*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -10965,6 +11187,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -11002,7 +11245,7 @@
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -11012,13 +11255,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -11027,19 +11270,51 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
-	ld_shlibs=no
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -11057,8 +11332,8 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -11073,24 +11348,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -11124,9 +11394,20 @@
 	else
 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -11143,7 +11424,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -11164,6 +11445,9 @@
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -11172,29 +11456,29 @@
 	  shared_flag='-G'
 	else
   	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
+	    shared_flag='${wl}-bM:SRE'
   	fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 _LT_AC_SYS_LIBPATH_AIX
@@ -11208,8 +11492,8 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -11222,7 +11506,7 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi4*)
+    bsdi[[45]]*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -11232,69 +11516,69 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.[012])
-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi  
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
       ;;
 
     dgux*)
@@ -11327,8 +11611,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -11336,7 +11620,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -11352,16 +11636,16 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -11371,7 +11655,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -11404,7 +11688,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -11414,7 +11698,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -11437,7 +11721,8 @@
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -11447,7 +11732,7 @@
 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	   ;;
 	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -11458,14 +11743,14 @@
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -11477,13 +11762,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -11502,10 +11787,12 @@
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -11514,8 +11801,18 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -11524,7 +11821,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -11584,9 +11881,9 @@
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       runpath_var='LD_RUN_PATH'
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -11644,7 +11941,7 @@
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-  
+
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -11778,7 +12075,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- kdemultimedia-3.5.0.orig/configure.in
+++ kdemultimedia-3.5.0/configure.in
@@ -40,7 +40,9 @@
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdemultimedia, "3.5.0") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdemultimedia-3.5-rc2, "3.5.0") dnl searches for some needed programs
+
+AM_MAINTAINER_MODE
 
 KDE_SET_PREFIX
 
@@ -1230,12 +1232,6 @@
 AC_MSG_RESULT($OS_TYPE)
 
 INTELCPPFLAG=
-dnl MMX_SUPPORT is set as variable in main configure.in.in
-dnl now make it a config.h entry
-if test x$MMX_SUPPORT = xyes; then
-   AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
-   INTELCPPFLAG="-DINTEL"
-fi
 AC_SUBST(INTELCPPFLAG)
 
 AC_DEFUN([KDE_MPEGLIB_COMPILES],
--- kdemultimedia-3.5.0.orig/aclocal.m4
+++ kdemultimedia-3.5.0/aclocal.m4
@@ -522,6 +522,35 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
--- kdemultimedia-3.5.0.orig/config.h.in
+++ kdemultimedia-3.5.0/config.h.in
@@ -266,9 +266,6 @@
    header file. */
 #undef HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H
 
-/* Define if you have MMX support on x86 with gcc */
-#undef INTEL
-
 /* Suffix for lib directories */
 #undef KDELIBSUFF
 
--- kdemultimedia-3.5.0.orig/Makefile.in
+++ kdemultimedia-3.5.0/Makefile.in
@@ -227,6 +227,9 @@
 LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
 MCOPIDL = @MCOPIDL@
@@ -464,7 +467,7 @@
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
 #>- 	@for dep in $?; do \
 #>- 	  case '$(am__configure_deps)' in \
 #>- 	    *$$dep*) \
@@ -506,12 +509,12 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 #>- 	cd $(srcdir) && $(AUTOCONF)
 #>+ 2
 	cd $(srcdir) && rm -f configure
 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
@@ -523,7 +526,7 @@
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -940,7 +943,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
 
 #>+ 2
 docs-am:
--- kdemultimedia-3.5.0.orig/configure
+++ kdemultimedia-3.5.0/configure
@@ -278,15 +278,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -464,7 +464,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1033,6 +1033,8 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
   --disable-fast-perl     disable fast Makefile generation (needs perl)
   --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
   --disable-debug         disables debug output and debug symbols default=no
@@ -1211,7 +1213,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1983,7 +1985,7 @@
 
 
 # Define the identity of the package.
- PACKAGE=kdemultimedia
+ PACKAGE=kdemultimedia-3.5-rc2
  VERSION="3.5.0"
 
 
@@ -2114,6 +2116,31 @@
 
 
 
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
 
   unset CDPATH
 
@@ -3047,8 +3074,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3106,8 +3132,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3223,8 +3248,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3278,8 +3302,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3324,8 +3347,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3369,8 +3391,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3927,8 +3948,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3986,8 +4006,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4058,8 +4077,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4103,8 +4121,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4282,8 +4299,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4394,8 +4410,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4483,8 +4498,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4586,8 +4600,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4686,8 +4699,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4771,8 +4783,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4861,8 +4872,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4949,8 +4959,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5037,8 +5046,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5144,8 +5152,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5232,8 +5239,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5320,8 +5326,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5408,8 +5413,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5540,8 +5544,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5629,8 +5632,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5717,8 +5719,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5805,8 +5806,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5893,8 +5893,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5981,8 +5980,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6405,8 +6403,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6532,8 +6529,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6621,8 +6617,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6705,185 +6700,6 @@
        KDE_USE_CLOSURE_TRUE="#"
        KDE_USE_CLOSURE_FALSE=""
        KDE_NO_UNDEFINED=""
-       case $host in
-         *-*-linux-gnu)
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- KDE_NO_UNDEFINED=""
-fi
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- KDE_NO_UNDEFINED=""
-fi
-
-           ;;
-       esac
   fi
 
 
@@ -7047,7 +6863,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7152,7 +6968,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -7186,7 +7002,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -7216,6 +7032,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -7302,44 +7127,36 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  lt_cv_deplibs_check_method=pass_all
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -7355,7 +7172,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -7372,42 +7189,21 @@
   ;;
 
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -7426,19 +7222,14 @@
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7448,7 +7239,6 @@
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -7525,7 +7315,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7528 "configure"' > conftest.$ac_ext
+  echo '#line 7318 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7568,14 +7358,13 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
-      LINUX_64_MODE="32"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -7587,7 +7376,6 @@
       esac
       ;;
     *64-bit*)
-      LINUX_64_MODE="64"
       case $host in
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
@@ -7647,8 +7435,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7723,8 +7510,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7894,8 +7680,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7962,8 +7747,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8078,6 +7862,243 @@
 
 done
 
+
+
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+fi
+
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -8170,7 +8191,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:8173:" \
+echo "$as_me:8194:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8216,8 +8237,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8266,8 +8286,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8325,7 +8344,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -8354,20 +8373,53 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -8404,9 +8456,6 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -8428,6 +8477,13 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
   ;;
@@ -8435,7 +8491,7 @@
   symcode='[BCDEGQRST]'
   ;;
 solaris* | sysv5*)
-  symcode='[BDT]'
+  symcode='[BDRT]'
   ;;
 sysv4)
   symcode='[DFNSTU]'
@@ -8453,14 +8509,17 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode='[ABCDGISTW]' ;;
+  symcode='[ABCDGIRSTW]' ;;
 esac
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -8622,7 +8681,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
@@ -8642,7 +8701,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -8927,6 +8986,17 @@
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -8952,7 +9022,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -9014,7 +9084,7 @@
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -9113,6 +9183,20 @@
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 #
 # Check for any special shared library compilation flags.
 #
@@ -9149,11 +9233,16 @@
    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
+       $SED '/^$/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works=yes
+       fi
      else
        lt_prog_compiler_static_works=yes
      fi
@@ -9199,18 +9288,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9209: \$? = $ac_status" >&5
+   echo "$as_me:9298: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -9287,7 +9378,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -9313,6 +9404,16 @@
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic='-qnocommon'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -9324,7 +9425,7 @@
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -9348,12 +9449,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
@@ -9374,9 +9482,14 @@
       ;;
 
     solaris*)
-      lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -9398,6 +9511,11 @@
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
@@ -9432,18 +9550,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9442: \$? = $ac_status" >&5
+   echo "$as_me:9560: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -9464,7 +9584,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
@@ -9486,38 +9606,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9505: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9618: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9509: \$? = $ac_status" >&5
+   echo "$as_me:9622: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -9588,6 +9706,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -9608,6 +9736,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -9645,7 +9794,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9655,13 +9804,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=no
+      allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -9670,19 +9819,51 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
-    netbsd*)
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs=no
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       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 $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${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
       ;;
 
@@ -9700,8 +9881,8 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${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'
       else
 	ld_shlibs=no
       fi
@@ -9716,24 +9897,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${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'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -9767,9 +9943,20 @@
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -9786,7 +9973,7 @@
       link_all_deplibs=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -9807,6 +9994,9 @@
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9815,21 +10005,22 @@
 	  shared_flag='-G'
 	else
   	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
+	    shared_flag='${wl}-bM:SRE'
   	fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9853,8 +10044,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9881,14 +10071,13 @@
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -9915,8 +10104,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9953,8 +10141,8 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec=' '
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -9967,7 +10155,7 @@
       ld_shlibs=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -9977,13 +10165,13 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=no
+      allow_undefined_flag=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
@@ -9993,52 +10181,52 @@
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
       hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
+      whole_archive_flag_spec=''
       link_all_deplibs=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs=no
+          ;;
+      esac
     fi
       ;;
 
@@ -10072,8 +10260,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -10081,7 +10269,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -10097,16 +10285,16 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -10116,7 +10304,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -10149,7 +10337,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -10159,7 +10347,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10182,7 +10370,8 @@
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec='${wl}-E'
       else
@@ -10192,7 +10381,7 @@
 	   hardcode_libdir_flag_spec='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -10203,14 +10392,14 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -10222,13 +10411,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10247,10 +10436,12 @@
     solaris*)
       no_undefined_flag=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -10259,8 +10450,18 @@
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs=yes
       ;;
@@ -10269,7 +10470,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -10329,9 +10530,9 @@
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
       no_undefined_flag='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       runpath_var='LD_RUN_PATH'
       hardcode_shlibpath_var=no
@@ -10437,7 +10638,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -10447,7 +10648,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -10512,7 +10726,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -10521,7 +10735,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10537,7 +10751,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -10549,7 +10763,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -10579,7 +10794,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -10602,7 +10817,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -10625,7 +10840,7 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
+kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10637,8 +10852,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -10656,7 +10880,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -10683,9 +10907,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -10700,7 +10924,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -10711,7 +10935,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -10773,22 +10997,19 @@
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -10798,6 +11019,30 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -10807,7 +11052,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -10836,7 +11081,11 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10856,7 +11105,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -10958,8 +11207,8 @@
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
+   test -n "$runpath_var" || \
+   test "X$hardcode_automatic" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct" != no &&
@@ -11085,8 +11334,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11189,8 +11437,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11255,8 +11502,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11349,8 +11595,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11415,8 +11660,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11482,8 +11726,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11549,8 +11792,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11625,7 +11867,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11628 "configure"
+#line 11870 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11691,7 +11933,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -11723,7 +11965,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11726 "configure"
+#line 11968 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11789,7 +12031,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -11839,7 +12081,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -11848,47 +12090,10 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.012)
-	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
     ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -11914,7 +12119,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -12028,11 +12234,11 @@
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -12062,6 +12268,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -12092,7 +12304,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -12123,7 +12335,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -12138,7 +12350,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -12365,7 +12577,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -12430,7 +12645,9 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12467,7 +12684,7 @@
 compiler_lib_search_path_CXX=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -12488,6 +12705,20 @@
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -12509,7 +12740,16 @@
 CC=${CXX-"c++"}
 compiler=$CC
 compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -12580,7 +12820,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -12614,7 +12854,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -12633,8 +12873,8 @@
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12660,7 +12900,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -12691,8 +12931,22 @@
       exp_sym_flag='-Bexport'
       no_entry_flag=""
     else
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+      esac
+
       exp_sym_flag='-bexport'
       no_entry_flag='-bnoentry'
     fi
@@ -12709,7 +12963,7 @@
     link_all_deplibs_CXX=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
+      case $host_os in aix4.[012]|aix4.[012].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -12730,6 +12984,9 @@
 	fi
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -12738,15 +12995,16 @@
 	shared_flag='-G'
       else
 	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='-qmkshrobj ${wl}-G'
+	  shared_flag='${wl}-G'
 	else
-	  shared_flag='-qmkshrobj'
+	  shared_flag='${wl}-bM:SRE'
 	fi
       fi
     fi
 
-    # Let the compiler handle the export list.
-    always_export_symbols_CXX=no
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    always_export_symbols_CXX=yes
     if test "$aix_use_runtimelinking" = yes; then
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
@@ -12776,8 +13034,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12806,13 +13063,12 @@
 
       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
 	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	cat >conftest.$ac_ext <<_ACEOF
@@ -12839,8 +13095,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12877,8 +13132,8 @@
 	# Exported symbols can be pulled into shared objects from archives
 	whole_archive_flag_spec_CXX=' '
 	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	# This is similar to how AIX traditionally builds its shared libraries.
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
@@ -12891,16 +13146,17 @@
     esac
     ;;
 
+
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
     # as there is no search path for DLLs.
     hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=no
+    allow_undefined_flag_CXX=unsupported
     always_export_symbols_CXX=no
     enable_shared_with_static_runtimes_CXX=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -12909,70 +13165,81 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
     else
       ld_shlibs_CXX=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      archive_cmds_need_lc_CXX=no
+      hardcode_direct_CXX=no
+      hardcode_automatic_CXX=yes
+      hardcode_shlibpath_var_CXX=unsupported
+      whole_archive_flag_spec_CXX=''
+      link_all_deplibs_CXX=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-      else
-	case ${MACOSX_DEPLOYMENT_TARGET} in
-	  10.012)
-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	    ;;
-	  10.*)
-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
-	    ;;
-	esac
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_CXX=no
+          ;;
+      esac
+      fi
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -12983,14 +13250,14 @@
 	;;
     esac
     ;;
-  freebsd12*)
+  freebsd[12]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs_CXX=no
     ;;
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -13007,12 +13274,12 @@
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       ld_shlibs_CXX=no
       ;;
-    aCC)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+    aCC*)
+      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
@@ -13021,11 +13288,11 @@
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
         # FIXME: insert proper C++ library support
         ld_shlibs_CXX=no
@@ -13035,7 +13302,7 @@
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*)
 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
@@ -13051,7 +13318,7 @@
         ;;
       esac
     fi
-    case "$host_cpu" in
+    case $host_cpu in
     hppa*64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
@@ -13072,17 +13339,17 @@
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      aCC)
-	case "$host_cpu" in
+      aCC*)
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
 	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	esac
 	# Commands to make compiler produce verbose output that lists
@@ -13098,12 +13365,12 @@
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    ia64*|hppa*64*)
 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
 	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    esac
 	  fi
@@ -13116,9 +13383,9 @@
     ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -13129,9 +13396,9 @@
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
 	fi
 	link_all_deplibs_CXX=yes
@@ -13142,14 +13409,14 @@
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	# Commands to make compiler produce verbose output that lists
 	# what "hidden" libraries, object files and flags are used when
 	# linking a shared library.
@@ -13167,20 +13434,44 @@
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
 	runpath_var=LD_RUN_PATH
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -13208,7 +13499,7 @@
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -13218,7 +13509,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -13229,15 +13520,31 @@
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    ld_shlibs_CXX=no
+    ;;
+  openbsd*)
+    hardcode_direct_CXX=yes
+    hardcode_shlibpath_var_CXX=no
+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      export_dynamic_flag_spec_CXX='${wl}-E'
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -13247,14 +13554,14 @@
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -13272,7 +13579,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13291,13 +13598,13 @@
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -13306,17 +13613,17 @@
 	# the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -13335,7 +13642,7 @@
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -13359,7 +13666,7 @@
   sco*)
     archive_cmds_need_lc_CXX=no
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -13371,12 +13678,12 @@
     ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -13389,36 +13696,33 @@
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        archive_cmds_need_lc_CXX=yes
 	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-R$libdir'
 	hardcode_shlibpath_var_CXX=no
 	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -13426,9 +13730,9 @@
 	# in the archive.
 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
 	# The C++ compiler must be used to create the archive.
 	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -13438,9 +13742,9 @@
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -13449,9 +13753,9 @@
 	  else
 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
@@ -13469,7 +13773,7 @@
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -13526,7 +13830,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -13566,7 +13870,7 @@
        fi
        ;;
 
-    *.$objext|*.$libext)
+    *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
        if test "$p" = "conftest.$objext"; then
@@ -13602,6 +13906,20 @@
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    postdeps_CXX='-lCstd -lCrun'
+    ;;
+  esac
+esac
+
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -13657,7 +13975,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -13682,18 +14000,28 @@
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           lt_prog_compiler_pic_CXX='-qnocommon'
+           lt_prog_compiler_wl_CXX='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -13701,22 +14029,22 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 	    if test "$host_cpu" != ia64; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -13731,7 +14059,7 @@
 	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -13742,18 +14070,24 @@
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -13770,25 +14104,25 @@
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    lt_prog_compiler_pic_CXX='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -13804,7 +14138,7 @@
 	;;
       sco*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  *)
@@ -13813,13 +14147,13 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    lt_prog_compiler_wl_CXX='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-PIC'
 	    ;;
@@ -13829,12 +14163,12 @@
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    lt_prog_compiler_pic_CXX='-pic'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -13844,7 +14178,7 @@
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -13885,18 +14219,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13891: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14225: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13895: \$? = $ac_status" >&5
+   echo "$as_me:14229: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
@@ -13917,7 +14253,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_CXX=
@@ -13939,38 +14275,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14287: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13962: \$? = $ac_status" >&5
+   echo "$as_me:14291: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -14020,7 +14354,10 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    link_all_deplibs_CXX=no
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -14103,7 +14440,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -14113,7 +14450,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -14178,7 +14528,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -14187,7 +14537,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14203,7 +14553,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -14215,7 +14565,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -14245,7 +14596,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -14268,7 +14619,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -14291,7 +14642,7 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
+kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -14303,8 +14654,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -14322,7 +14682,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -14349,9 +14709,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -14366,7 +14726,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -14377,7 +14737,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -14439,22 +14799,19 @@
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -14464,6 +14821,30 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -14473,7 +14854,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -14502,7 +14883,11 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14522,7 +14907,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -14624,8 +15009,8 @@
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
+   test -n "$runpath_var_CXX" || \
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_CXX" != no &&
@@ -14751,8 +15136,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14855,8 +15239,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14921,8 +15304,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15015,8 +15397,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15081,8 +15462,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15148,8 +15528,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15215,8 +15594,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15291,7 +15669,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15294 "configure"
+#line 15672 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15357,7 +15735,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -15389,7 +15767,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15392 "configure"
+#line 15770 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15455,7 +15833,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -15506,7 +15884,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -15606,6 +15985,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -15636,7 +16021,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -15667,7 +16052,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -15682,7 +16067,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -15884,7 +16269,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -15960,12 +16348,35 @@
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
@@ -15978,7 +16389,7 @@
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -15986,8 +16397,10 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -16064,7 +16477,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -16090,6 +16503,16 @@
 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_F77='-qnocommon'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -16101,7 +16524,7 @@
       lt_prog_compiler_wl_F77='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -16125,12 +16548,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fpic'
+	lt_prog_compiler_static_F77='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_F77='-Wl,'
         # All Alpha code is PIC.
@@ -16151,9 +16581,14 @@
       ;;
 
     solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_F77='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_F77='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -16175,6 +16610,11 @@
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_F77='-pic'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -16209,18 +16649,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16215: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16655: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16219: \$? = $ac_status" >&5
+   echo "$as_me:16659: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_F77=yes
      fi
    fi
@@ -16241,7 +16683,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_F77=
@@ -16263,38 +16705,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16282: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16717: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16286: \$? = $ac_status" >&5
+   echo "$as_me:16721: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -16365,6 +16805,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -16385,6 +16835,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -16422,7 +16893,7 @@
 	allow_undefined_flag_F77=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs_F77=no
       fi
@@ -16432,13 +16903,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=no
+      allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -16447,19 +16918,51 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
-	ld_shlibs=no
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs_F77=no
+      else
+	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -16477,8 +16980,8 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
@@ -16493,24 +16996,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
+    if test "$ld_shlibs_F77" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_F77=
+      export_dynamic_flag_spec_F77=
+      whole_archive_flag_spec_F77=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -16544,9 +17042,20 @@
 	else
 	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -16563,7 +17072,7 @@
       link_all_deplibs_F77=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -16584,6 +17093,9 @@
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -16592,21 +17104,22 @@
 	  shared_flag='-G'
 	else
   	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
+	    shared_flag='${wl}-bM:SRE'
   	fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols_F77=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_F77=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_F77='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
       program main
 
       end
@@ -16620,8 +17133,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16648,14 +17160,13 @@
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -16672,8 +17183,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16710,8 +17220,8 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_F77=' '
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -16724,7 +17234,7 @@
       ld_shlibs_F77=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -16734,68 +17244,68 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=no
+      allow_undefined_flag_F77=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
       hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
+      whole_archive_flag_spec_F77=''
       link_all_deplibs_F77=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_F77=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_F77=no
+          ;;
+      esac
     fi
       ;;
 
@@ -16829,8 +17339,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
@@ -16838,7 +17348,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -16854,16 +17364,16 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -16873,7 +17383,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -16906,7 +17416,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
@@ -16916,7 +17426,7 @@
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16939,7 +17449,8 @@
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_F77='${wl}-E'
       else
@@ -16949,7 +17460,7 @@
 	   hardcode_libdir_flag_spec_F77='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -16960,14 +17471,14 @@
       hardcode_libdir_flag_spec_F77='-L$libdir'
       hardcode_minus_L_F77=yes
       allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -16979,13 +17490,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -17004,10 +17515,12 @@
     solaris*)
       no_undefined_flag_F77=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -17016,8 +17529,18 @@
       hardcode_shlibpath_var_F77=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -17026,7 +17549,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -17086,9 +17609,9 @@
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
       no_undefined_flag_F77='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       runpath_var='LD_RUN_PATH'
       hardcode_shlibpath_var_F77=no
@@ -17194,7 +17717,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -17204,7 +17727,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -17269,7 +17805,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -17278,7 +17814,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -17294,7 +17830,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -17306,7 +17842,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -17336,7 +17873,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -17359,7 +17896,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -17382,7 +17919,7 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
+kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17394,8 +17931,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -17413,7 +17959,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -17440,9 +17986,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -17457,7 +18003,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -17468,7 +18014,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -17530,22 +18076,19 @@
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -17555,6 +18098,30 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -17564,7 +18131,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -17593,7 +18160,11 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -17613,7 +18184,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -17715,8 +18286,8 @@
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
+   test -n "$runpath_var_F77" || \
+   test "X$hardcode_automatic_F77" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_F77" != no &&
@@ -17792,7 +18363,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -17892,6 +18464,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -17922,7 +18500,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -17953,7 +18531,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -17968,7 +18546,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18170,7 +18748,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -18203,7 +18784,7 @@
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -18214,15 +18795,41 @@
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 archive_cmds_need_lc_GCJ=no
 
+old_archive_cmds_GCJ=$old_archive_cmds
+
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
@@ -18249,18 +18856,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18255: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18259: \$? = $ac_status" >&5
+   echo "$as_me:18866: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -18337,7 +18946,7 @@
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -18363,6 +18972,16 @@
 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_GCJ='-qnocommon'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -18374,7 +18993,7 @@
       lt_prog_compiler_wl_GCJ='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -18398,12 +19017,19 @@
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-fpic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_GCJ='-Wl,'
         # All Alpha code is PIC.
@@ -18424,9 +19050,14 @@
       ;;
 
     solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_GCJ='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -18448,6 +19079,11 @@
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_GCJ='-pic'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -18482,18 +19118,20 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19124: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18492: \$? = $ac_status" >&5
+   echo "$as_me:19128: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
@@ -18514,7 +19152,7 @@
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_GCJ=
@@ -18536,38 +19174,36 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-   # that will create temporary files in the current directory regardless of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do parallel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18555: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19186: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18559: \$? = $ac_status" >&5
+   echo "$as_me:19190: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
-   chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   chmod u+w . 2>&5
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -18638,6 +19274,16 @@
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -18658,6 +19304,27 @@
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -18695,7 +19362,7 @@
 	allow_undefined_flag_GCJ=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
@@ -18705,13 +19372,13 @@
       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=no
+      allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -18720,19 +19387,51 @@
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
-	ld_shlibs=no
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs_GCJ=no
+      else
+	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -18750,8 +19449,8 @@
 
 EOF
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
@@ -18766,24 +19465,19 @@
 
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
+    if test "$ld_shlibs_GCJ" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_GCJ=
+      export_dynamic_flag_spec_GCJ=
+      whole_archive_flag_spec_GCJ=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -18817,9 +19511,20 @@
 	else
 	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	esac
 
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
@@ -18836,7 +19541,7 @@
       link_all_deplibs_GCJ=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -18857,6 +19562,9 @@
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -18865,21 +19573,22 @@
 	  shared_flag='-G'
 	else
   	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='-qmkshrobj ${wl}-G'
+	    shared_flag='${wl}-G'
 	  else
-	    shared_flag='-qmkshrobj'
+	    shared_flag='${wl}-bM:SRE'
   	fi
 	fi
       fi
 
-      # Let the compiler handle the export list.
-      always_export_symbols_GCJ=no
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols_GCJ=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag_GCJ='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18903,8 +19612,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18931,14 +19639,13 @@
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -18965,8 +19672,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19003,8 +19709,8 @@
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_GCJ=' '
 	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -19017,7 +19723,7 @@
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -19027,68 +19733,68 @@
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=no
+      allow_undefined_flag_GCJ=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-	;;
-      *) # Darwin 1.3 on
-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	else
-	  case ${MACOSX_DEPLOYMENT_TARGET} in
-	    10.012)
-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-	      ;;
-	    10.*)
-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
-	      ;;
-	  esac
-	fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
       hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      whole_archive_flag_spec_GCJ=''
       link_all_deplibs_GCJ=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_GCJ=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_GCJ=no
+          ;;
+      esac
     fi
       ;;
 
@@ -19122,8 +19828,8 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
@@ -19131,7 +19837,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -19147,16 +19853,16 @@
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
+	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -19166,7 +19872,7 @@
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -19199,7 +19905,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
@@ -19209,7 +19915,7 @@
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -19232,7 +19938,8 @@
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_GCJ='${wl}-E'
       else
@@ -19242,7 +19949,7 @@
 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	   ;;
        esac
@@ -19253,14 +19960,14 @@
       hardcode_libdir_flag_spec_GCJ='-L$libdir'
       hardcode_minus_L_GCJ=yes
       allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
+      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -19272,13 +19979,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -19297,10 +20004,12 @@
     solaris*)
       no_undefined_flag_GCJ=' -z text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	wlarc='${wl}'
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -19309,8 +20018,18 @@
       hardcode_shlibpath_var_GCJ=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -19319,7 +20038,7 @@
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -19379,9 +20098,9 @@
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
       no_undefined_flag_GCJ='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       runpath_var='LD_RUN_PATH'
       hardcode_shlibpath_var_GCJ=no
@@ -19487,7 +20206,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -19497,7 +20216,20 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -19562,7 +20294,7 @@
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
   ;;
 
 beos*)
@@ -19571,7 +20303,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -19587,7 +20319,7 @@
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -19599,7 +20331,8 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -19629,7 +20362,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -19652,7 +20385,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -19675,7 +20408,7 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu*)
+kfreebsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19687,8 +20420,17 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -19706,7 +20448,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -19733,9 +20475,9 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -19750,7 +20492,7 @@
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -19761,7 +20503,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -19823,22 +20565,19 @@
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -19848,6 +20587,30 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -19857,7 +20620,7 @@
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
@@ -19886,7 +20649,11 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -19906,7 +20673,7 @@
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -20008,8 +20775,8 @@
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+   test -n "$runpath_var_GCJ" || \
+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_GCJ" != no &&
@@ -20135,8 +20902,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20239,8 +21005,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20305,8 +21070,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20399,8 +21163,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20465,8 +21228,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20532,8 +21294,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20599,8 +21360,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20675,7 +21435,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20678 "configure"
+#line 21438 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20741,7 +21501,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -20773,7 +21533,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20776 "configure"
+#line 21536 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20839,7 +21599,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -20890,7 +21650,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -20990,6 +21751,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -21020,7 +21787,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -21051,7 +21818,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -21066,7 +21833,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -21268,7 +22035,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -21311,11 +22081,35 @@
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -21331,7 +22125,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -21431,6 +22226,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -21461,7 +22262,7 @@
 NM=$lt_NM
 
 # A symbol stripping program
-STRIP=$STRIP
+STRIP=$lt_STRIP
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD
@@ -21492,7 +22293,7 @@
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -21507,7 +22308,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -21709,7 +22510,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 
 
@@ -21756,7 +22560,7 @@
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
@@ -21997,8 +22801,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22072,9 +22875,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22108,8 +22908,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22213,8 +23012,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22293,9 +23091,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22328,8 +23123,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22432,8 +23226,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22523,8 +23316,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22585,8 +23377,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22654,8 +23445,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22721,8 +23511,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22815,8 +23604,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22894,8 +23682,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22979,8 +23766,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23048,8 +23834,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23144,8 +23929,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23209,8 +23993,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23305,8 +24088,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23370,8 +24152,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23467,8 +24248,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23532,8 +24312,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23630,8 +24409,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23696,8 +24474,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23765,8 +24542,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23917,8 +24693,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24073,8 +24848,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24139,8 +24913,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24287,8 +25060,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24443,8 +25215,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24500,9 +25271,6 @@
 save_CXXFLAGS="$CXXFLAGS"
 kde_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24536,8 +25304,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24641,8 +25408,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24742,8 +25508,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24817,8 +25582,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24881,8 +25645,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24944,8 +25707,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24985,8 +25747,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25042,8 +25803,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25083,8 +25843,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25148,8 +25907,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25180,10 +25938,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -25294,8 +26050,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25357,8 +26112,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25398,8 +26152,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25455,8 +26208,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25496,8 +26248,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25561,8 +26312,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25593,10 +26343,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -25707,8 +26455,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25770,8 +26517,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25811,8 +26557,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25868,8 +26613,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25909,8 +26653,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25974,8 +26717,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26006,10 +26748,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26120,8 +26860,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26183,8 +26922,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26224,8 +26962,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26281,8 +27018,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26322,8 +27058,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26387,8 +27122,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26419,10 +27153,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26541,8 +27273,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26613,8 +27344,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26684,8 +27414,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26747,8 +27476,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26788,8 +27516,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26845,8 +27572,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26886,8 +27612,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26951,8 +27676,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26983,10 +27707,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27098,8 +27820,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27161,8 +27882,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27202,8 +27922,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27259,8 +27978,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27300,8 +28018,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27365,8 +28082,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27397,10 +28113,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27511,8 +28225,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27593,8 +28306,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27694,8 +28406,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27875,8 +28586,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27985,8 +28695,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28210,8 +28919,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28434,8 +29142,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28511,8 +29218,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28738,8 +29444,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28814,8 +29519,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28875,8 +29579,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28959,8 +29662,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29053,8 +29755,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29228,8 +29929,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29327,8 +30027,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29415,8 +30114,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29493,8 +30191,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29547,7 +30244,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 29550: $i/$j" >&5
+    echo "configure: 30247: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -29845,7 +30542,7 @@
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 29848: $i/$j" >&5
+    echo "configure: 30545: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -30522,8 +31219,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30682,7 +31378,7 @@
 do
   for j in $kde_check_header;
   do
-    echo "configure: 30685: $i/$j" >&5
+    echo "configure: 31381: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -30712,7 +31408,7 @@
 do
   for j in $kde_check_lib;
   do
-    echo "configure: 30715: $i/$j" >&5
+    echo "configure: 31411: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -30730,7 +31426,7 @@
 do
   for j in "kde3/plugins/designer/kdewidgets.la";
   do
-    echo "configure: 30733: $i/$j" >&5
+    echo "configure: 31429: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_widgetdir=$i
@@ -32253,7 +32949,7 @@
 do
   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
   do
-    echo "configure: 32256: $i/$j" >&5
+    echo "configure: 32952: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -32451,8 +33147,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32524,8 +33219,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32579,8 +33273,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32651,8 +33344,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32706,8 +33398,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32774,8 +33465,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32959,8 +33649,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33110,8 +33799,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33297,8 +33985,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33418,8 +34105,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33488,8 +34174,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33577,8 +34262,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33670,8 +34354,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33750,8 +34433,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33920,8 +34602,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34003,8 +34684,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34086,8 +34766,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34169,8 +34848,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34310,8 +34988,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34465,8 +35142,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34562,8 +35238,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34717,8 +35392,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34797,8 +35471,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34856,8 +35529,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34915,8 +35587,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35108,8 +35779,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35278,8 +35948,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35322,7 +35991,7 @@
 do
   for j in libcdda_paranoia.$ext;
   do
-    echo "configure: 35325: $i/$j" >&5
+    echo "configure: 35994: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       para_libdir=$i
@@ -35461,8 +36130,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35631,8 +36299,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35808,8 +36475,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36306,8 +36972,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36468,8 +37133,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36654,8 +37318,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37094,8 +37757,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37265,8 +37927,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37393,8 +38054,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37549,8 +38209,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37665,8 +38324,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37821,8 +38479,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37929,8 +38586,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38093,8 +38749,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38155,8 +38810,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38216,8 +38870,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38279,8 +38932,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38341,8 +38993,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38403,8 +39054,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38536,8 +39186,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38686,8 +39335,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38743,8 +39391,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38892,8 +39539,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38994,8 +39640,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39145,8 +39790,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39298,8 +39942,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39341,8 +39984,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39399,8 +40041,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39530,8 +40171,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39609,8 +40249,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39673,8 +40312,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39737,8 +40375,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39801,8 +40438,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39856,14 +40492,6 @@
 echo "${ECHO_T}$OS_TYPE" >&6
 
 INTELCPPFLAG=
-if test x$MMX_SUPPORT = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define INTEL 1
-_ACEOF
-
-   INTELCPPFLAG="-DINTEL"
-fi
 
 
 
@@ -39954,8 +40582,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40030,8 +40657,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40091,8 +40717,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40389,8 +41014,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40462,8 +41086,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40517,8 +41140,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40589,8 +41211,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40644,8 +41265,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40712,8 +41332,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40878,8 +41497,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40948,8 +41566,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41133,8 +41750,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41228,8 +41844,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41315,8 +41930,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41420,8 +42034,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41718,8 +42331,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -41841,8 +42453,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -42557,6 +43168,13 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -43559,6 +44177,9 @@
 s,@AMTAR@,$AMTAR,;t t
 s,@am__tar@,$am__tar,;t t
 s,@am__untar@,$am__untar,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
 s,@KDECONFIG@,$KDECONFIG,;t t
 s,@kde_libs_prefix@,$kde_libs_prefix,;t t
 s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
@@ -44024,11 +44645,6 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -44067,6 +44683,12 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
--- kdemultimedia-3.5.0.orig/debian/patches/11_applications_menu_move.diff
+++ kdemultimedia-3.5.0/debian/patches/11_applications_menu_move.diff
@@ -0,0 +1,9 @@
+--- kde.orig/kappfinder-data/Makefile.am
++++ kde.patched/kappfinder-data/Makefile.am
+@@ -25,5 +25,5 @@
+ xdg_directory_DATA = kde-multimedia-music.directory
+ 
+ xdg_mergedmenu_DATA = kde-multimedia-music.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+ 
--- kdemultimedia-3.5.0.orig/debian/patches/14_mpeglib_noexecstack.diff
+++ kdemultimedia-3.5.0/debian/patches/14_mpeglib_noexecstack.diff
@@ -0,0 +1,7 @@
+--- kde.orig/mpeglib/lib/mpegplay/mmxidct_asm.S
++++ kde.patched/mpeglib/lib/mpegplay/mmxidct_asm.S
+@@ -736,3 +736,4 @@
+ 
+ #endif
+ 
++.section	.note.GNU-stack,"",@progbits
--- kdemultimedia-3.5.0.orig/debian/patches/13_mpeglib_PIC.diff
+++ kdemultimedia-3.5.0/debian/patches/13_mpeglib_PIC.diff
@@ -0,0 +1,15 @@
+--- kde.orig/mpeglib/configure.in.in
++++ kde.patched/mpeglib/configure.in.in
+@@ -144,12 +144,6 @@
+ AC_MSG_RESULT($OS_TYPE)
+ 
+ INTELCPPFLAG=
+-dnl MMX_SUPPORT is set as variable in main configure.in.in
+-dnl now make it a config.h entry
+-if test x$MMX_SUPPORT = xyes; then
+-   AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
+-   INTELCPPFLAG="-DINTEL"
+-fi
+ AC_SUBST(INTELCPPFLAG)
+ 
+ AC_DEFUN([KDE_MPEGLIB_COMPILES],
--- kdemultimedia-3.5.0.orig/debian/patches/common/04_am_maintainer_mode.diff
+++ kdemultimedia-3.5.0/debian/patches/common/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
--- kdemultimedia-3.5.0.orig/debian/patches/common/03_libtool_update.diff
+++ kdemultimedia-3.5.0/debian/patches/common/03_libtool_update.diff
@@ -0,0 +1,6192 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in	2005-11-10 12:07:37.000000000 -0500
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
+ 
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +523,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,7 +541,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -578,7 +605,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -615,11 +644,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -643,7 +677,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -672,20 +706,53 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -924,20 +991,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1150,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1160,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1238,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -1169,7 +1247,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1275,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1329,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,7 +1352,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1285,8 +1364,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -1331,9 +1419,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1436,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1447,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1421,22 +1509,19 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -1446,6 +1531,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -1455,7 +1564,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -1484,7 +1593,11 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1617,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -1650,7 +1763,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -1712,7 +1827,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1886,7 +2001,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2111,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -2028,7 +2143,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2170,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -2088,44 +2212,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+-  
++
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -2141,7 +2257,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2158,42 +2274,21 @@
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -2212,19 +2307,14 @@
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2234,7 +2324,6 @@
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2342,13 +2431,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -2367,13 +2456,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2500,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2487,6 +2587,10 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -2500,7 +2604,7 @@
+ fi
+ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
+   else
+     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+@@ -2541,7 +2645,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2550,48 +2654,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2616,7 +2683,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2645,7 +2712,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2660,6 +2727,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2681,7 +2752,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2770,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2797,7 @@
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2827,22 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -2774,7 +2859,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -2795,6 +2880,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -2803,15 +2891,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +2909,12 @@
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+@@ -2840,8 +2928,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
+@@ -2854,16 +2942,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +2961,81 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
+       fi
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-    fi
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    fi
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3046,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3070,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -2984,11 +3084,11 @@
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,7 +3098,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -3014,7 +3114,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3035,17 +3135,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3161,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -3079,9 +3179,9 @@
+     ;;
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -3092,9 +3192,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3105,14 +3205,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -3130,20 +3230,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
+ 	# Intel C++
+ 	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
+ 	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3295,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3305,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -3192,15 +3316,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3350,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3375,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3394,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3409,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3438,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3322,7 +3462,7 @@
+   sco*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3334,12 +3474,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3492,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -3389,9 +3526,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
++      gcx*)
+ 	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3538,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3549,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3432,7 +3569,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3542,7 +3679,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -3582,7 +3719,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -3618,6 +3755,21 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -3668,12 +3820,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3839,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -3691,8 +3847,10 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3743,20 +3901,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3803,11 +3968,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4003,12 @@
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+-  fi  
++  fi
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+     deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3887,7 +4058,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3953,11 +4124,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4159,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -4018,7 +4195,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4226,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4241,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4470,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -4335,9 +4515,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -4359,6 +4536,13 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+@@ -4366,7 +4550,7 @@
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris* | sysv5*)
+-  symcode='[[BDT]]'
++  symcode='[[BDRT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -4384,14 +4568,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
++  symcode='[[ABCDGIRSTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -4555,7 +4742,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -4580,18 +4767,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4599,22 +4796,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -4629,7 +4826,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -4640,18 +4837,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
+-	  cxx)
++	    ;;
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4871,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -4702,7 +4905,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -4711,13 +4914,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -4727,12 +4930,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4742,7 +4945,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4813,7 +5016,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4839,6 +5042,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5063,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4874,12 +5087,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -4900,9 +5120,14 @@
+       ;;
+ 
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -4924,6 +5149,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5181,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4984,7 +5214,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux*)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -5010,7 +5243,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5260,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5047,6 +5281,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -5084,7 +5339,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5094,13 +5349,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,19 +5364,51 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -5139,8 +5426,8 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5155,24 +5442,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5206,9 +5488,20 @@
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -5225,7 +5518,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -5246,6 +5539,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5254,29 +5550,29 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       if test "$aix_use_runtimelinking" = yes; then
+ 	# Warning - without using the other runtime loading flags (-brtl),
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+@@ -5290,8 +5586,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -5304,7 +5600,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5610,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
+       ;;
+ 
+     dgux*)
+@@ -5409,8 +5705,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +5714,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       fi
+@@ -5434,16 +5730,16 @@
+ 
+     hpux10* | hpux11*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -5453,7 +5749,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -5486,7 +5782,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +5792,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -5519,7 +5815,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -5529,7 +5826,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -5540,14 +5837,14 @@
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +5856,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5584,10 +5881,12 @@
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+       else
++	wlarc=''
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +5895,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +5915,7 @@
+       if test "x$host_vendor" = xsequent; then
+ 	# Use $CC to link under sequent, because it throws in some extra .o
+ 	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -5666,9 +5975,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5726,7 +6035,7 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+@@ -5860,7 +6169,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/ltmain.sh	2005-11-10 12:07:37.000000000 -0500
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+   cat <<EOF
+ $*
+ EOF
+-  exit 0
++  exit $EXIT_SUCCESS
+ fi
+ 
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+-  SP2NL="tr '\100' '\n'"
+-  NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
+   ;;
+- *) # Assume ASCII based system
+-  SP2NL="tr '\040' '\012'"
+-  NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
+   ;;
+ esac
+ 
+@@ -94,12 +113,14 @@
+ fi
+ 
+ # Make sure IFS has a sensible default
+-: ${IFS=" 	"}
++lt_nl='
++'
++IFS=" 	$lt_nl"
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -118,10 +139,14 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+@@ -130,7 +155,7 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+ 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+       if test "X$win32_nmres" = "Ximport" ; then
+@@ -140,7 +165,7 @@
+       fi
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +179,179 @@
+   $echo $win32_libid_type
+ }
+ 
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      status=$?
++      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+ 
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +371,13 @@
+       ;;
+     tag)
+       tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+ 	;;
+       esac
+ 
+@@ -191,10 +387,10 @@
+ 	# not specially marked.
+ 	;;
+       *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+@@ -220,24 +416,25 @@
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
++    exit $?
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-    exit 0
++    exit $?
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --dry-run | -n)
+@@ -256,7 +453,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,6 +465,7 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --tag) prevopt="--tag" prev=tag ;;
+@@ -275,6 +473,7 @@
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -285,7 +484,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,7 +497,7 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+@@ -311,7 +510,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+@@ -354,7 +553,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -369,13 +568,15 @@
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
+     suppress_output=
+     arg_mode=normal
+     libobj=
++    later=
+ 
+     for arg
+     do
+-      case "$arg_mode" in
++      case $arg_mode in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+@@ -394,24 +595,19 @@
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+-	-static)
+-	  build_old_libs=yes
++	-static | -prefer-pic | -prefer-non-pic)
++	  later="$later $arg"
+ 	  continue
+ 	  ;;
+ 
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
+-
+-	-prefer-non-pic)
+-	  pic_mode=no
++	-no-suppress)
++	  suppress_opt=no
+ 	  continue
+ 	  ;;
+ 
+@@ -424,7 +620,7 @@
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+@@ -462,7 +658,10 @@
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+@@ -474,11 +673,11 @@
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+@@ -511,51 +710,39 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base compile
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
++    func_infer_tag $base_compile
++
++    for arg in $later; do
++      case $arg in
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
+ 	;;
+       esac
+-    fi
++    done
+ 
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+@@ -568,7 +755,7 @@
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+@@ -579,7 +766,7 @@
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -598,7 +785,7 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -608,7 +795,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -626,14 +813,19 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+-      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+@@ -655,10 +847,10 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+@@ -681,7 +873,7 @@
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -701,7 +893,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +914,9 @@
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
++      if test "$suppress_opt" = yes; then
++        suppress_output=' >/dev/null 2>&1'
++      fi
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+@@ -736,9 +930,9 @@
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -751,7 +945,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +965,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1003,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1029,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1041,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1061,7 @@
+     no_install=no
+     objs=
+     non_pic_objects=
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -881,6 +1075,8 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+@@ -912,7 +1108,6 @@
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+-      base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+@@ -976,7 +1171,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -991,6 +1186,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1223,7 @@
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+@@ -1076,7 +1276,7 @@
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		else
+ 		  # Dry-run case.
+ 
+@@ -1097,7 +1297,7 @@
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+@@ -1109,7 +1309,7 @@
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -1149,16 +1349,15 @@
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-	        *" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-              esac
+-              ;;
+-   	  esac
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++        darwin_framework)
++	  compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1409,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -1220,6 +1419,14 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch)
++        prev=darwin_framework
++        compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++        continue
++        ;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1453,7 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1280,18 +1487,18 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    continue
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1301,18 +1508,36 @@
+ 	continue
+ 	;;
+ 
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1365,6 +1590,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1617,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1473,11 +1703,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1713,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1740,7 @@
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+@@ -1569,7 +1793,7 @@
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  else
+ 	    # Dry-run case.
+ 
+@@ -1623,7 +1847,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1860,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
+-    fi
+-
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $compile_command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1722,7 +1904,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +1914,7 @@
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
++      # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+@@ -1785,7 +1967,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +1993,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -1823,18 +2008,23 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    compiler_flags="$compiler_flags $deplib"
++	  fi
++	  continue
++	  ;;
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+-	  if test "$pass" = conv && test "$allow_undefined" = yes; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    for search_ext in .la $shrext .so .a; do
++	    for search_ext in .la $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+@@ -1895,18 +2085,6 @@
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -1922,11 +2100,11 @@
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2132,22 @@
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2005,14 +2198,14 @@
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2221,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2230,6 @@
+ 	*) . ./$lib ;;
+ 	esac
+ 
+-	case $host in
+-	*-*-darwin*)
+-	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+-	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  ;;
+-	esac
+-
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2240,32 @@
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    #echo "Adding $deplib to \$deplibs"
+-	    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
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    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
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+-    
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -2086,16 +2273,18 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2321,19 @@
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+@@ -2144,7 +2341,7 @@
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -2171,7 +2368,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2209,12 +2406,12 @@
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
+ 	      esac
+ 	    fi
+ 
+@@ -2258,17 +2455,18 @@
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+-	    $echo "*** $linklib is not portable!"    
+-      fi	  
++	    $echo "*** $linklib is not portable!"
++	  fi
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+@@ -2326,9 +2524,10 @@
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
++	      cmds=$extract_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2339,9 +2538,10 @@
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      cmds=$old_archive_from_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2364,9 +2564,9 @@
+ 		case $host in
+ 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+@@ -2374,7 +2574,7 @@
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+-		      fi 
++		      fi
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2597,9 @@
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+-		  case "$libdir" in
++		  case $libdir in
+ 		    [\\/]*)
+-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2416,7 +2616,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -2459,7 +2659,8 @@
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+@@ -2469,9 +2670,9 @@
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+-		case "$libdir" in
++		case $libdir in
+ 		  [\\/]*)
+-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2530,17 +2731,16 @@
+ 	      fi
+ 	    fi
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+-	  #if test -n "$dependency_libs" &&
+-	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+-	  #     test "$link_static" = yes; }; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2554,7 +2754,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2796,18 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+-		    # Sure, some shells/systems don't implement the -ef.
+-		    # Those will have to live with the warning.
+-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
++		  # we do not want to link against static libs,
++		  # but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+@@ -2617,55 +2815,45 @@
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+-		   fi
++		    fi
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+ 		    *) newlib_search_path="$newlib_search_path $path";;
+ 		    esac
+-		    path=""
+ 		  fi
++		  path=""
+ 		  ;;
+ 		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
++		  path="-L$path"
++		  ;;
++		esac
+ 		;;
+-		  -l*)
++	      -l*)
+ 		case $host in
+ 		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
+ 		  ;;
+ 		*) continue ;;
+-		esac  		  
+-		;;
+-
+-	      *.ltframework)
+-		case $host in
+-		  *-*-darwin*)
+-		    depdepl="$deplib"
+-		    ;;
+ 		esac
+ 		;;
+-
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
+-	      case " $deplibs " in
+ 	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+@@ -2752,7 +2940,8 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2812,19 +3001,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3024,7 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3072,13 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+-	
++
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+@@ -2918,6 +3107,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -2929,36 +3123,36 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -2975,7 +3169,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3047,7 +3241,7 @@
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -3098,9 +3292,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+@@ -3137,7 +3337,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -3170,12 +3370,12 @@
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+@@ -3225,7 +3425,7 @@
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,7 +3462,7 @@
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+@@ -3314,7 +3514,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3583,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3663,7 @@
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+@@ -3509,13 +3709,6 @@
+ 	    fi
+ 	  fi
+ 	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	case $host in
+-	  *-*-darwin*)
+-	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    ;;
+-	esac
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+@@ -3532,7 +3725,7 @@
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+@@ -3587,7 +3780,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -3617,10 +3810,11 @@
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
++	    cmds=$export_symbols_cmds
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+@@ -3630,6 +3824,9 @@
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+@@ -3650,12 +3847,12 @@
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+-		*) 
++		*)
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+-	deplibs="$tmp_deplibs" 
++	deplibs="$tmp_deplibs"
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +3860,13 @@
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -3734,31 +3877,27 @@
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+-	# Add all flags from the command line.  We here create a library,
+-	# but those flags were only added to compile_command and
+-	# finalize_command, which are only used when creating executables.
+-	# So do it by hand here.
+-	compiler_flags="$compiler_flags $add_flags"
+-	# Only add it to commands which use CC, instead of LD, i.e.
+-	# only to $compiler_flags
+-	#linker_flags="$linker_flags $add_flags"
+-
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval cmds=\"$module_expsym_cmds\"
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
+ 	  else
+-	    eval cmds=\"$module_cmds\"
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
+ 	else
+-	  eval cmds=\"$archive_cmds\"
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
+ 	  fi
+ 	fi
+ 
+-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+@@ -3777,6 +3916,7 @@
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+@@ -3786,13 +3926,13 @@
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+@@ -3806,9 +3946,9 @@
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
+ 	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+@@ -3828,13 +3968,13 @@
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+-	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +3999,54 @@
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
++	    else
++	      cmds=$module_cmds
++	    fi
++	  else
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval cmds=\"$archive_expsym_cmds\"
++	    cmds=$archive_expsym_cmds
+ 	  else
+-	    eval cmds=\"$archive_cmds\"
++	    cmds=$archive_cmds
++	    fi
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+-	  eval cmds=\"\$cmds~$rm $delfiles\"
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -3928,7 +4094,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3957,64 +4123,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
+-	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
+-	    fi
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -4022,10 +4134,11 @@
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+-      eval cmds=\"$reload_cmds\"
++      cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -4038,7 +4151,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4164,18 @@
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+-	eval cmds=\"$reload_cmds\"
++	cmds=$reload_cmds
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -4073,7 +4187,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,21 +4212,18 @@
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+-      *-*-darwin*)
++      *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+       esac
+ 
+@@ -4277,12 +4388,12 @@
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+ 	  fi
+@@ -4334,7 +4445,26 @@
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
+   const char *name;
+   lt_ptr address;
+ }
+@@ -4394,7 +4524,7 @@
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4407,17 +4537,6 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+-      # This does not apply on AIX for ia64, which uses a SysV linker.
+-      case "$host" in
+-        ia64-*-aix5*) ;;
+-        *-*-aix4* | *-*-aix5*)
+-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+-      esac
+-
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+@@ -4493,7 +4612,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -4548,10 +4667,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -4573,11 +4692,11 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
++	  *cygwin* | *mingw* )
++	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
+ 	    cwrapper=`$echo ${output}.exe`
+ 	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+@@ -4586,7 +4705,7 @@
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+-   
++
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+@@ -4618,7 +4737,7 @@
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
++#ifndef DIR_SEPARATOR_2
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+@@ -4649,7 +4768,7 @@
+ {
+   char **newargz;
+   int i;
+-  
++
+   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+@@ -4662,7 +4781,7 @@
+   newargz[1] = fnqualify(argv[0]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
++  strendzap(newargz[1],".exe");
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
+@@ -4673,6 +4792,7 @@
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,7 +4805,7 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+@@ -4699,7 +4819,7 @@
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha (name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+@@ -4709,7 +4829,7 @@
+   return (char *) base;
+ }
+ 
+-char * 
++char *
+ fnqualify(const char *path)
+ {
+   size_t size;
+@@ -4737,7 +4857,7 @@
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4757,7 +4877,7 @@
+ }
+ 
+ static void
+-lt_error_core (int exit_status, const char * mode, 
++lt_error_core (int exit_status, const char * mode,
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4786,7 +4906,7 @@
+ 	  ;;
+ 	esac
+ 	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4807,7 +4927,7 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -4886,7 +5006,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5056,32 @@
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+-	  # Need to set LD_LIBRARY_PATH, to the value already
+-	  # computed within libtool.
+ 	  $echo >> $output "\
+-      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -4986,78 +5104,78 @@
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
+-	  fi
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
+       fi
+ 
+-      compiler_flags="$compiler_flags $add_flags"
+-
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
++       cmds=$old_archive_from_new_cmds
+       else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    status=$?
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
++	  cmds=$old_archive_cmds
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+@@ -5066,31 +5184,18 @@
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
+-	  fi
++
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+-	  done  
++	  done
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+@@ -5098,7 +5203,7 @@
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+-	      fi  
++	      fi
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+@@ -5109,12 +5214,13 @@
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+@@ -5146,11 +5252,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       if test "$hardcode_automatic" = yes ; then
+-        relink_command=
+-      fi  
++	relink_command=
++      fi
++
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+@@ -5168,7 +5276,7 @@
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -5182,7 +5290,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -5193,11 +5301,30 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+@@ -5241,7 +5368,7 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -5254,7 +5381,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5392,11 @@
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5278,14 +5405,14 @@
+       shift
+     else
+       install_prog=
+-      arg="$nonopt"
++      arg=$nonopt
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+       arg="\"$arg\""
+       ;;
+     esac
+@@ -5303,28 +5430,31 @@
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+-	dest="$arg"
++	dest=$arg
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+-      -*) ;;
+-
++      -*)
++	;;
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+-	  dest="$arg"
++	  dest=$arg
+ 	  continue
+ 	fi
+ 	;;
+@@ -5333,7 +5463,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5473,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -5359,7 +5489,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -5380,7 +5510,7 @@
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -5392,7 +5522,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -5421,7 +5551,7 @@
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -5463,7 +5593,7 @@
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+@@ -5478,7 +5608,7 @@
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -5502,23 +5632,36 @@
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
++	  cmds=$postinstall_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+@@ -5556,7 +5699,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +5717,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +5755,21 @@
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -5650,17 +5791,15 @@
+ 	  done
+ 
+ 	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  outputname=
+@@ -5669,8 +5808,12 @@
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      save_umask=`umask`
++	      umask 0077
++	      if $mkdir "$tmpdir"; then
++	        umask $save_umask
+ 	      else
++	        umask $save_umask
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+@@ -5697,7 +5840,7 @@
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
++	# one anyway 
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+@@ -5729,16 +5872,17 @@
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
++      if test -n "$stripme" && test -n "$old_striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
++      cmds=$old_postinstall_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -5752,9 +5896,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5773,10 +5917,11 @@
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
++	  cmds=$finish_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+@@ -5793,7 +5938,7 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+     $echo "----------------------------------------------------------------------"
+     $echo "Libraries have been installed in:"
+@@ -5829,7 +5974,7 @@
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+     $echo "----------------------------------------------------------------------"
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5841,7 +5986,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -5849,7 +5994,7 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+@@ -5860,7 +6005,7 @@
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -5887,7 +6032,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -5967,7 +6112,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6140,7 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+@@ -6050,10 +6195,11 @@
+ 	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
++	      cmds=$postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6211,11 @@
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      eval cmds=\"$old_postuninstall_cmds\"
++	      cmds=$old_postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6107,7 +6254,7 @@
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
++	  *.exe)
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6299,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -6201,7 +6348,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6313,6 +6460,8 @@
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+@@ -6354,14 +6503,14 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $?
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
--- kdemultimedia-3.5.0.orig/debian/patches/common/02_autotools_update.diff
+++ kdemultimedia-3.5.0/debian/patches/common/02_autotools_update.diff
@@ -0,0 +1,22 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp	2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp	2005-10-28 15:11:00.000000000 -0400
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2005-05-14.22
++scriptversion=2005-07-09.11
+ 
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+@@ -467,7 +467,8 @@
+   done
+ 
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+     sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
--- kdemultimedia-3.5.0.orig/debian/patches/common/update.sh
+++ kdemultimedia-3.5.0/debian/patches/common/update.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+ADMIN="$1"
+
+test -d "$ADMIN" || {
+    echo >&2 "Error, admin dir '$ADMIN' does not exist."
+    exit 1
+}
+
+rm -rf a b
+mkdir  a b
+
+cp -a "$ADMIN" a/admin
+
+############################################################
+PATCH=03_libtool_update.diff
+rm -rf b/admin; cp -a a/admin b
+
+cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
+cp -f /usr/share/libtool/ltmain.sh  b/admin/ltmain.sh
+
+diff -Nrua a b >$PATCH
+############################################################
+
+
+############################################################
+PATCH=02_autotools_update.diff
+AUTOMAKE_DIR=/usr/share/automake-1.9
+rm -rf b/admin; cp -a a/admin b
+
+( cd b/admin
+  for file in *; do
+      case "$file" in
+	  config.guess|config.sub)
+	      continue
+	      ;;
+      esac
+      if test -r "$AUTOMAKE_DIR/$file"; then
+	  cp -f "$AUTOMAKE_DIR/$file" "$file"
+      fi
+  done
+)
+
+diff -Nrua a b >$PATCH
+############################################################
+
+rm -rf a b
--- kdemultimedia-3.5.0.orig/debian/patches/common/06_disable_no_undefined.diff
+++ kdemultimedia-3.5.0/debian/patches/common/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
--- kdemultimedia-3.5.0.orig/debian/patches/common/05_pedantic-errors.diff
+++ kdemultimedia-3.5.0/debian/patches/common/05_pedantic-errors.diff
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
--- kdemultimedia-3.5.0.orig/debian/patches/common/README
+++ kdemultimedia-3.5.0/debian/patches/common/README
@@ -0,0 +1,14 @@
+Common patches across KDE Debian packages
+=========================================
+
+  These directory should contain patches to the admin/ subdir of KDE
+  modules that are meant to be applied to all packaged modules. As the
+  admin/ subdir is shared across modules (and so, it's identical for all
+  modules at a certain version), I think it makes sense to have these
+  patches in a central location, and update them here.
+
+  The script update.sh takes care of automatically updating the patches
+  that update autotools and libtool. You need to pass the location of an
+  admin/ directory as the first argument.
+
+  -- Adeodato Simó, 2005-02-26
--- kdemultimedia-3.5.0.orig/debian/patches/common/07_disable-visibility.diff
+++ kdemultimedia-3.5.0/debian/patches/common/07_disable-visibility.diff
@@ -0,0 +1,143 @@
+--- kde/admin/acinclude.m4.in	2005-11-21 16:59:50.000000000 +0000
++++ kde/admin/acinclude.m4.in	2005-11-21 17:01:34.000000000 +0000
+@@ -3339,73 +3339,73 @@
+ 
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
+-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+-    [
+-      kde_have_gcc_visibility=yes
+-      dnl the whole toolchain is just a mess, gcc is just too buggy
+-      dnl to handle STL with visibility enabled. Lets reconsider 
+-      dnl when gcc 4.2 is out or when things get fixed in the compiler.
+-      dnl Contact mueller@kde.org for details.
+-      AC_ARG_ENABLE(gcc-hidden-visibility,
+-        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
+-          [kde_have_gcc_visibility=$enableval],
+-          [kde_have_gcc_visibility=no])
+-
+-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+-        [
+-          AC_LANG_SAVE
+-          AC_LANG_CPLUSPLUS
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          AC_TRY_COMPILE(
+-          [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-          ], [/* elvis is alive */],
+-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          AC_LANG_RESTORE
+-        ]
+-      )
+-
+-      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-        KDE_CHECK_VISIBILITY_GCC_BUG
+-        HAVE_GCC_VISIBILITY=1
+-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+-      fi
+-    ])
+-  fi
++dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl  if test "x$GXX" = "xyes"; then
++dnl    AC_LANG_SAVE
++dnl    AC_LANG_CPLUSPLUS
++dnl    AC_EGREP_CPP(
++dnl       [GCC visibility push],
++dnl       [ #include <exception> 
++dnl       ], 
++dnl    [
++dnl      AC_MSG_RESULT(yes)
++dnl      kde_stdc_visibility_patched=yes ],
++dnl    [ 
++dnl      AC_MSG_RESULT(no)
++dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++dnl                   visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl      kde_stdc_visibility_patched=no ])
++dnl
++dnl    AC_LANG_RESTORE
++dnl
++dnl    kde_have_gcc_visibility=no
++dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
++dnl    [
++dnl      kde_have_gcc_visibility=yes
++dnl      dnl the whole toolchain is just a mess, gcc is just too buggy
++dnl      dnl to handle STL with visibility enabled. Lets reconsider 
++dnl      dnl when gcc 4.2 is out or when things get fixed in the compiler.
++dnl      dnl Contact mueller@kde.org for details.
++dnl      AC_ARG_ENABLE(gcc-hidden-visibility,
++dnl        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
++dnl          [kde_have_gcc_visibility=$enableval],
++dnl          [kde_have_gcc_visibility=no])
++dnl
++dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl        [
++dnl          AC_LANG_SAVE
++dnl          AC_LANG_CPLUSPLUS
++dnl
++dnl          safe_CXXFLAGS=$CXXFLAGS
++dnl          CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl          AC_TRY_COMPILE(
++dnl          [
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
++dnl          ], [/* elvis is alive */],
++dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl          CXXFLAGS=$safe_CXXFLAGS
++dnl          AC_LANG_RESTORE
++dnl        ]
++dnl      )
++dnl
++dnl      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl        KDE_CHECK_VISIBILITY_GCC_BUG
++dnl        HAVE_GCC_VISIBILITY=1
++dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl      fi
++dnl    ])
++dnl  fi
+ ])
+ 
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
--- kdemultimedia-3.5.0.orig/debian/patches/common/kubuntu_01_kdepot.diff
+++ kdemultimedia-3.5.0/debian/patches/common/kubuntu_01_kdepot.diff
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh	2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
--- kdemultimedia-3.5.0.orig/debian/patches/12_noatun_kconf.diff
+++ kdemultimedia-3.5.0/debian/patches/12_noatun_kconf.diff
@@ -0,0 +1,13 @@
+--- kde.orig/noatun/Makefile.am
++++ kde.patched/noatun/Makefile.am
+@@ -11,7 +11,9 @@
+ 
+ updatedir = $(kde_datadir)/kconf_update
+ update_DATA = noatun.upd
+-update_PROGRAMS = noatun20update
++
++kconfdir = $(libdir)/kconf_update_bin
++kconf_PROGRAMS = noatun20update
+ 
+ noatun20update_SOURCES  = noatun20update.cpp
+ noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--- kdemultimedia-3.5.0.orig/debian/patches/kubuntu_02_hide_arts_menu_entries.diff
+++ kdemultimedia-3.5.0/debian/patches/kubuntu_02_hide_arts_menu_entries.diff
@@ -0,0 +1,14 @@
+--- kdemultimedia/arts/builder/artsbuilder.desktop	2005-03-24 04:45:49.863186112 +0000
++++ kdemultimedia/arts/builder/artsbuilder.desktop	2005-03-24 04:45:58.062939560 +0000
+@@ -99,3 +99,4 @@
+ X-DCOP-ServiceType=Multi
+ OnlyShowIn=KDE;
+ Categories=Qt;KDE;AudioVideo;X-KDE-More;
++NoDisplay=true
+--- kdemultimedia/arts/tools/artscontrol.desktop	2005-03-24 04:46:48.481274808 +0000
++++ kdemultimedia/arts/tools/artscontrol.desktop	2005-03-24 04:46:58.140806336 +0000
+@@ -114,3 +114,4 @@
+ DocPath=artsbuilder/index.html
+ OnlyShowIn=KDE;
+ Categories=Qt;KDE;AudioVideo;X-KDE-More;
++NoDisplay=true
--- kdemultimedia-3.5.0.orig/debian/man/kaudiocreator.1
+++ kdemultimedia-3.5.0/debian/man/kaudiocreator.1
@@ -0,0 +1,145 @@
+.TH kaudiocreator 1 "Nov 2005" "K Desktop Environment" ""
+.SH NAME
+kaudiocreator \- CD ripper and audio encoder front-end
+.SH SYNOPSIS
+kaudiocreator [Qt-options] [KDE-options] 
+.SH DESCRIPTION
+.B kaudiocreator 
+is the CD ripper and audio encoder front-end for the K Desktop Environment. It
+supports many encoders like 
+.BR lame (1),
+.BR oggenc (1),
+.BR flac (1),
+and performs CDDB queries.
+
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-kde  
+Show KDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the title bar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the title bar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible window manager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+ 
+
+.SH AUTHOR
+Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
+
+Please use <http://bugs.kde.org> to report bugs, do not mail the authors
+directly.
+
+
+This man-page was written by Francois Wendling <frwendling@free.fr>
--- kdemultimedia-3.5.0.orig/debian/man/kaboodle.1
+++ kdemultimedia-3.5.0/debian/man/kaboodle.1
@@ -0,0 +1,261 @@
+.lf 1 info/kdemultimedia.kaboodle.1
+.TH KABOODLE 1 "May 2003" KDE "KDE Application"
+.SH NAME
+kaboodle \- KDE simple and lean Media Player
+.SH SYNOPSIS
+.B kaboodle
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kaboodle
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B Kaboodle
+is a simple KMedia (aRts) player for KDE, which can play standalone,
+or embedded in Konqueror. The embedded player should work for media embedded in khtml, too.
+It is meant for simple stuff like playing a quick video or sound file. 
+.B Kaboodle
+does not accept plugins, does not have a playlist or volume control and other such features.
+.P
+To get a media-player with a full-fledged user interface, look at
+.BR noatun (1)
+.SH OPTIONS
+.SS "Arguments:"
+.TP
+URL
+URL of media file to play
+.SS "General Options"
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.lf 1 info/kdeqtoptions
+.SS "KDE options"
+.TP 12
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
+icon, which can either be an absolute filename path, or otherwise the
+icon is sought for in places according to the normal KDE rules.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
+of the icon, according to the same rules as for the \-\-icon parameter.
+.TP
+.BI \-\-config \ filename
+Use an alternative configuration file, instead of the default, which
+is normally located in
+.I /usr/share/config
+or in
+.RB $ KDEHOME\fI/share/config
+.TP
+.BI \-\-dcopserver \ server
+Set the address of the DCOP server to attach to.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps. This option has the same
+effect as definiting the environment variable KDE_DEBUG.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+The geometry parameter follows the normal X convention for geometry,
+which is on the form:
+.RS
+.IP
+[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
+.P
+Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
+height, of the main application window. Both in pixels. A value of 0
+specifies the default size. The optional \fIxpos\fR and \fIypos\fR
+specifies the x,y-position that which is desired for the application
+window. Specifying negative values for x or y implies that the x or y
+position is to be measured from the left or bottom screen edge,
+instead of as in the normal case, with positive values, from the left
+and top edges. 
+.RE
+.SS "Qt options"
+.TP 12
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+Defines the default application font. The \fIfontname\fP should be in
+the X logical font name description format XLFD. For a full description of
+the format see
+.I /usr/X11R6/lib/X11/doc/xlfd.TXT
+Note that the application might override the font specified with
+its own font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+Sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+Sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+Sets the default button color.
+.TP
+.BI \-\-name \ name
+Sets the application name.
+.TP
+.BI \-\-title \ title
+Sets the application title. This option might, or might not appear
+in the title bar caption, depending on the application. To change the caption, use the 
+.B \-\-caption
+option instead. 
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+Sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.TP
+.B \-\-reverse
+Mirror reverses the whole layout of widgets. This means that menus
+will go in the opposite direction, the scroll bar will be on the
+opposite side, etc. For a normal western layout that means that menus
+and tool bars will go from the right edge to the left, the vertical
+scroll bar will be on the left side and so on.
+
+.lf 53 info/kdemultimedia.kaboodle.1
+.SH ENVIRONMENT
+.lf 1 info/kdeenviron
+.SS "standard KDE environment variables"
+.IP KDE_LANG
+Language locale setting to use. This option makes it possible to set
+another language environment for a program than what is the default. The
+correct language pack for this language has to be installed for this option
+to work. The default language when there is none set is en_US. When
+deciding upon a language, the following resources are looked up, in
+order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
+LANG.
+.IP KDE_UTF8_FILENAMES
+Assume that all filenames are in UTF-8 format regardless of the
+current language setting. Otherwise the filename format is defined by
+the language.
+.IP KDE_MULTIHEAD
+If this variable has the value
+.B true
+multihead multiple display mode is enabled. The KDE display will be
+shared over more than one screen.
+.IP DISPLAY
+Specifies the X display to run KDE on.
+.IP KDESYCOCA
+Specifies and alternative path for the 
+.I ksycoca
+KDE system configuration cache file.
+The default path is
+/tmp/kde-$USER/ksycoca
+.IP DCOPSERVER
+Specifies an alternative path for the DCOP server file. The default
+file is
+$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
+.IP SESSION_MANAGER
+The session manager to use. This option is set automatically by KDE
+and is a network path to the session manager socket.
+.IP HOME
+Path to the home directory for the current user. 
+.IP KDEHOME
+The KDE per-user setting directory. Default if not specified is
+.I $HOME/.kde
+.lf 55 info/kdemultimedia.kaboodle.1
+.SH FILES
+.TP
+.I $HOME/.kde/share/config/kaboodlerc
+configuration file.
+.SH AUTHOR
+Kaboodle was written by
+.nh
+.ad l
+Neil Stevens <neil@qualityassistant.com>,
+Nikolas Zimmermann <wildfox@kde.org>,
+and Charles Samuels <charles@kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.BR noatun (1)
+.br
+The full documentation for
+.B kaboodle
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kaboodle
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/kaboodle
--- kdemultimedia-3.5.0.orig/debian/man/krec.1
+++ kdemultimedia-3.5.0/debian/man/krec.1
@@ -0,0 +1,59 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH krec "1" "July 2004" "Debian" "User Commands"
+.SH NAME
+krec \- A voice recording program
+.SH SYNOPSIS
+.B krec
+[\fIoptions\fR]
+.SH DESCRIPTION
+This is a recording tool for KDE.
+It uses aRts, just look at the audiomanager
+and you will find it there accepting sound
+for recording.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+
+
+.SH USAGE
+Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
+	
+.SH AUTHORS
+krec is (C)2002-2003 By Arnold Krille (arnold@arnoldarts.de)
+.P
+This man page was written and maintained by Ryan Waye (rmw998@gmail.com) 
+.PP
+.
+.
+.SH "STANDARD DISCLAIMER"
+Use only at your own risk!
+There may be errors and inaccuracies that could be damaging to your system or
+your eye.
+Proceed with caution, and although this is highly unlikely, the authors don't
+take any responsibility for that!
+.PP
+
+This document is licensed under the GPL.
+.P
+KDE: 3.2.2
+.P
+KRec: 0.5
--- kdemultimedia-3.5.0.orig/debian/man/kmix.1
+++ kdemultimedia-3.5.0/debian/man/kmix.1
@@ -0,0 +1,49 @@
+.TH KMIX 1 "August, 15 2003"
+.SH NAME
+Kmix \- KDE audio mini-mixer
+.SH SYNOPSIS
+.B kmix 
+.RI [ OPTIONS ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmix
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBKmix\fP is a mini audio mixer for kde. It allows the user to change
+volume settings for each sound device (master, CD, line, mic, ...).
+.SH OPTIONS
+A summary of options for Kmix is included below.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+
+.SH SEE ALSO
+.BR kmixctrl (1),
+.PP
+For more details, you should have a look at the KDE Help center, available
+from the K menu.
+.SH AUTHOR
+This manual page was written by Clément Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmix was written by the KDE project.
--- kdemultimedia-3.5.0.orig/debian/man/juk.1
+++ kdemultimedia-3.5.0/debian/man/juk.1
@@ -0,0 +1,22 @@
+.TH "JuK" "1" "October 2003"
+.SH "NAME"
+juk \- music organizer and player for KDE
+.SH "SYNOPSIS"
+\fBjuk\fR
+.SH "DESCRIPTION"
+.LP 
+
+JuK (pronounced "jook") is a jukebox and music manager for the KDE
+desktop similar to jukebox software on other platforms such as
+iTunes or RealOne.
+
+.
+.SH "OPTIONS"
+.l
+\fIjuk\fP does not accept any command-line options.
+.
+
+.SH "AUTHOR"
+This page was written by David Schleef <ds@schleef.org> for Debian,
+but may be used elsewhere.
+
--- kdemultimedia-3.5.0.orig/debian/man/kmixctrl.1
+++ kdemultimedia-3.5.0/debian/man/kmixctrl.1
@@ -0,0 +1,54 @@
+.TH KMIXCTRL 1 "August, 25 2003"
+.SH NAME
+kmixctrl \- Settings loader/saver for kmix
+.SH SYNOPSIS
+.B kmixctrl 
+.RI [ OPTIONS ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmixctrl
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
+.SH OPTIONS
+A summary of options for kmixctrl is included below.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-s, \-\-save
+Save the current settings as default
+.TP
+.B \-r, \-\-restore
+Restores the default settings
+
+.SH SEE ALSO
+.BR kmix (1),
+.PP
+For more details, you should have a look at the KDE Help center, available
+from the K menu.
+.SH AUTHOR
+This manual page was written by Clément Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmixctrl was written by the KDE project.
--- kdemultimedia-3.5.0.orig/debian/icons/artsbuilder.xpm
+++ kdemultimedia-3.5.0/debian/icons/artsbuilder.xpm
@@ -0,0 +1,155 @@
+/* XPM */
+static char *artsbuilder[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 133 2",
+"   c black",
+".  c gray2",
+"X  c #060606",
+"o  c #070707",
+"O  c #090909",
+"+  c gray4",
+"@  c #161616",
+"#  c #181818",
+"$  c gray11",
+"%  c gray12",
+"&  c gray13",
+"*  c #222222",
+"=  c #282828",
+"-  c gray19",
+";  c #323232",
+":  c gray20",
+">  c gray25",
+",  c gray26",
+"<  c #434343",
+"1  c #444444",
+"2  c #464646",
+"3  c gray28",
+"4  c #484848",
+"5  c #494949",
+"6  c gray29",
+"7  c gray31",
+"8  c #535353",
+"9  c gray33",
+"0  c #585858",
+"q  c #5A5A5A",
+"w  c gray36",
+"e  c #5F5F5F",
+"r  c #626262",
+"t  c #646464",
+"y  c #686868",
+"u  c #6A6A6A",
+"i  c gray42",
+"p  c #6C6C6C",
+"a  c #6D6D6D",
+"s  c #6F6F6F",
+"d  c #727272",
+"f  c #747474",
+"g  c gray46",
+"h  c #777777",
+"j  c gray48",
+"k  c #7B7B7B",
+"l  c #7C7C7C",
+"z  c gray49",
+"x  c #7E7E7E",
+"c  c #818181",
+"v  c #838383",
+"b  c #848484",
+"n  c gray53",
+"m  c gray54",
+"M  c #8B8B8B",
+"N  c gray55",
+"B  c #8D8D8D",
+"V  c #8E8E8E",
+"C  c gray56",
+"Z  c #909090",
+"A  c gray57",
+"S  c #929292",
+"D  c #939393",
+"F  c gray58",
+"G  c #959595",
+"H  c gray59",
+"J  c gray60",
+"K  c #9B9B9B",
+"L  c gray61",
+"P  c #9D9D9D",
+"I  c #A0A0A0",
+"U  c gray63",
+"Y  c #A2A2A2",
+"T  c gray64",
+"R  c gray65",
+"E  c #A7A7A7",
+"W  c #A9A9A9",
+"Q  c gray67",
+"!  c #ACACAC",
+"~  c gray68",
+"^  c #AFAFAF",
+"/  c gray69",
+"(  c #B2B2B2",
+")  c gray70",
+"_  c #B4B4B4",
+"`  c gray71",
+"'  c #B6B6B6",
+"]  c #B7B7B7",
+"[  c #B9B9B9",
+"{  c gray73",
+"}  c #BCBCBC",
+"|  c gray74",
+" . c gray",
+".. c gray75",
+"X. c #C1C1C1",
+"o. c gray77",
+"O. c #C5C5C5",
+"+. c gray78",
+"@. c #C8C8C8",
+"#. c gray79",
+"$. c #CACACA",
+"%. c #CBCBCB",
+"&. c gray80",
+"*. c #CDCDCD",
+"=. c #CECECE",
+"-. c gray81",
+";. c #D0D0D0",
+":. c #D2D2D2",
+">. c LightGray",
+",. c gray83",
+"<. c gray84",
+"1. c #D7D7D7",
+"2. c gray85",
+"3. c gray86",
+"4. c gainsboro",
+"5. c #DDDDDD",
+"6. c #DFDFDF",
+"7. c gray88",
+"8. c #E6E6E6",
+"9. c #E7E7E7",
+"0. c gray91",
+"q. c #E9E9E9",
+"w. c gray92",
+"e. c #ECECEC",
+"r. c #EFEFEF",
+"t. c gray94",
+"y. c #F3F3F3",
+"u. c gray96",
+"i. c gray98",
+"p. c #FDFDFD",
+"a. c #FEFEFE",
+"s. c gray100",
+"d. c None",
+/* pixels */
+"d.d.d.  6 h V K K M q @ d.d.d.d.",
+"d.d.$ c o.E V k l V ( ..8   d.d.",
+"d.o V +.c i i i a i i Z >.a   d.",
+"  d 1.c l c l k l c c k Z 2.3 d.",
+"$ %.W V Z Z ( -.%.E Z D M ..~ + ",
+"q >.E P P %.u.i.y.6.{ P P ~ 1.- ",
+"k >.( ( { 2.6.5.2.%.+.( ( { >.5 ",
+"d -.%.o...) ) { ( ~ W ..o.%.-.< ",
+"3 ..5.2.-.J D D D V P 1.1.2.( = ",
+"@ V 1.w.9.>.Z l l J 2.0.w.-.k o ",
+"  5 K 5.s.s.w.2.5.u.s.i.1.Z -   ",
+"d.o 8 V +.w.s.s.s.s.9.{ n 3   d.",
+"d.d.o : a l D E K V d a -   d.d.",
+"d.d.d.+ q r r t d M ) h   d.d.d.",
+"d.d.d.d.$ w c ) 9.9.J @ d.d.d.d.",
+"d.d.d.d.d.o & < 3 &   d.d.d.d.d."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/juk-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/juk-16.xpm
@@ -0,0 +1,144 @@
+/* XPM */
+static char *juk-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 122 2",
+"   c black",
+".  c #000100",
+"X  c #010102",
+"o  c #020202",
+"O  c #030404",
+"+  c #040405",
+"@  c #040406",
+"#  c #00140B",
+"$  c #00180E",
+"%  c #101015",
+"&  c #121216",
+"*  c #131317",
+"=  c #131318",
+"-  c #1A1A1F",
+";  c #002410",
+":  c #0C2E1B",
+">  c #00300A",
+",  c #03310C",
+"<  c #00370F",
+"1  c #02331F",
+"2  c #013A29",
+"3  c #23232A",
+"4  c #29292F",
+"5  c #292931",
+"6  c #2B2B34",
+"7  c #2B2B35",
+"8  c #313D40",
+"9  c #393943",
+"0  c #393949",
+"q  c #3F384A",
+"w  c #3E3E48",
+"e  c #004108",
+"r  c #004906",
+"t  c #024F11",
+"y  c #04550F",
+"u  c #075312",
+"i  c #045319",
+"p  c #006E08",
+"a  c #08661F",
+"s  c #037A12",
+"d  c #156523",
+"f  c #247939",
+"g  c #44444F",
+"h  c #4F4F5E",
+"j  c #555561",
+"k  c #545462",
+"l  c #545469",
+"z  c #575768",
+"x  c #5B5B6A",
+"c  c #5F5F6C",
+"v  c #5D5D71",
+"b  c #476956",
+"n  c #58776B",
+"m  c #63636D",
+"M  c #616171",
+"N  c #626276",
+"B  c #636377",
+"V  c #666673",
+"C  c #666677",
+"Z  c #676779",
+"A  c #757585",
+"S  c #79798A",
+"D  c #79798B",
+"F  c #18832F",
+"G  c #1A842B",
+"H  c #1C9B2D",
+"J  c #00A601",
+"K  c #00A60D",
+"L  c #01A118",
+"P  c #00AF12",
+"I  c #00AF18",
+"U  c #09AC17",
+"Y  c #258E39",
+"T  c #308D3B",
+"R  c #30B539",
+"E  c #308A40",
+"W  c #3EA247",
+"Q  c #00E406",
+"!  c #19E721",
+"~  c #38F33B",
+"^  c #4D8D5A",
+"/  c #4AA75B",
+"(  c #4DA65D",
+")  c #58A665",
+"_  c #698B7B",
+"`  c #79A886",
+"'  c #807A99",
+"]  c #8D8E9D",
+"[  c #8E88A3",
+"{  c #9595AA",
+"}  c #9C9CAE",
+"|  c #9E9EB1",
+" . c #A1A0B3",
+".. c #A1A1B4",
+"X. c #A6A6BC",
+"o. c #AAAABB",
+"O. c #ADADC2",
+"+. c #B1B1C5",
+"@. c #B4B4C7",
+"#. c #B5B5C6",
+"$. c #B7B5C6",
+"%. c #B5B5C8",
+"&. c #BABACC",
+"*. c #85EE8C",
+"=. c #C3C4CA",
+"-. c #C2C2D2",
+";. c #C4C4D1",
+":. c #C4C4D4",
+">. c #CEC4D8",
+",. c #CAC9DA",
+"<. c #D1C9DC",
+"1. c #D2C8DE",
+"2. c #D1CEDF",
+"3. c #E2D7EE",
+"4. c #E0DFED",
+"5. c #E7E3E7",
+"6. c #E8E6F4",
+"7. c #F2EEF2",
+"8. c #F5ECF9",
+"9. c #FCFBFF",
+"0. c gray100",
+"q. c None",
+/* pixels */
+"q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.",
+"q.q.q.2 ;     q.q.q.q.q.q.q.q.q.",
+"q.q.q.1 ( :     q.q.q.z Z h     ",
+"q.q.q.# / *.f $   q.N c 4 m w   ",
+"q.q.q.  a d T G     D     5 V   ",
+"q.q.q.q.i u   t , q D - 3   A   ",
+"q.q.q.q.< s O 8 _ $.o.| 7 N j   ",
+"q.q.q.e > p b 1.2.%...} v j +   ",
+"q.q.u W R J ) 3.-.+.X.{ 7       ",
+"q.r U ~ ! Q H >.:.%.O.Z *       ",
+"q.n L P I K T 1.,.&.x         q.",
+"q.D ` Y F ^ =.4.#.9 +       q.q.",
+"q.= [ 7.5.8.6.] =           q.q.",
+"q.  0 ..0.-.g           q.q.q.q.",
+"q.q.  z M *           q.q.q.q.q.",
+"q.q.q.              q.q.q.q.q.q."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kaboodle.xpm
+++ kdemultimedia-3.5.0/debian/icons/kaboodle.xpm
@@ -0,0 +1,151 @@
+/* XPM */
+static char *kaboodle[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 113 2",
+"   c black",
+".  c #424297",
+"X  c #4B4B9D",
+"o  c #4F50A1",
+"O  c #5455A3",
+"+  c #5658A8",
+"@  c #5B5BA6",
+"#  c #5C5EAA",
+"$  c #5E61AD",
+"%  c #5F63B0",
+"&  c #6363AA",
+"*  c #6868AC",
+"=  c #6063B1",
+"-  c #6C6DB1",
+";  c #6A6DB9",
+":  c #6C71B7",
+">  c #6F74BE",
+",  c #7373B3",
+"<  c #7075BE",
+"1  c #777ABE",
+"2  c #7A7AB6",
+"3  c #7C7EBB",
+"4  c #6C79C3",
+"5  c #6E7FC9",
+"6  c #737DC1",
+"7  c #68BE79",
+"8  c #7E80BD",
+"9  c #7282CB",
+"0  c #7980C1",
+"q  c #7A86C8",
+"w  c #7589D2",
+"e  c #7D8CD0",
+"r  c #FE8235",
+"t  c #E99570",
+"y  c #FEDC66",
+"u  c #8282BC",
+"i  c #8487C3",
+"p  c #878AC7",
+"a  c #8188CD",
+"s  c #8A8BC1",
+"d  c #888DCE",
+"f  c #8C91CC",
+"g  c #8295D9",
+"h  c #8A9CDD",
+"j  c #9595C5",
+"k  c #9193C8",
+"l  c #9698CD",
+"z  c #9C9DCB",
+"x  c #959EDE",
+"c  c #989CD3",
+"v  c #989ED8",
+"b  c #989CFE",
+"n  c #9FA0CE",
+"m  c #9EA1D3",
+"M  c #9BA1DC",
+"N  c #9CABE6",
+"B  c #A3A3CD",
+"V  c #A8A8CF",
+"C  c #A3A4D1",
+"Z  c #A5AAD6",
+"A  c #A6ABDE",
+"S  c #AAABD3",
+"D  c #ABADD9",
+"F  c #AFB0D5",
+"G  c #ADB1DD",
+"H  c #B2B2D5",
+"J  c #B4B5D9",
+"K  c #BCBCDB",
+"L  c #A8A8FE",
+"P  c #A6B4FE",
+"I  c #AAB3FB",
+"U  c #B4BBEB",
+"Y  c #B2BCF2",
+"T  c #B3BFF8",
+"R  c #95C8B4",
+"E  c #A5D3BA",
+"W  c #A5D0C3",
+"Q  c #BDC1E7",
+"!  c #BEC3EA",
+"~  c #B7C3FA",
+"^  c #BCC3F0",
+"/  c #BBC7FE",
+"(  c #BDC8FD",
+")  c #DEBCA8",
+"_  c #CBBFDB",
+"`  c #E0CE94",
+"'  c #E7DBB6",
+"]  c #C0C0DC",
+"[  c #C3C6E7",
+"{  c #C5C4E9",
+"}  c #C6CBEC",
+"|  c #C8CCEA",
+" . c #C1CCFD",
+".. c #CED1ED",
+"X. c #C6D0FE",
+"o. c #CAD3FD",
+"O. c #CFD8FE",
+"+. c #D2D4EC",
+"@. c #D1D6F5",
+"#. c #D3DBFD",
+"$. c #D8DEFD",
+"%. c #DCE2FE",
+"&. c #E2E2EF",
+"*. c #E2E4F5",
+"=. c #E1E6FE",
+"-. c #E4E8FE",
+";. c #E8E8F2",
+":. c #E9ECFC",
+">. c #EDF0FE",
+",. c #F3F5FD",
+"<. c #F6F8FE",
+"1. c #FEFEFE",
+"2. c None",
+/* pixels */
+"2.2.2.2.2.2.2.2.2.2.2.2.2.2.w w w w w w w w w 2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.w w w 2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.S e 2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.B Z j 2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.z j D z s 2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.2.2.2.2.2.B z n k f ( m u 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.2.2.2.V B S { O.Y v o.#.j 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.2.S S H } $.#.#.O.#.:.<.z 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.H J +.=.%.$.$.$.=.>.:.*.u 2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.K :.-.=.=.%.%.=.=.#.$.$.u 2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.] 1.:.=.$.%.#.o.o.o.#...u 2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.",
+"2.2.2.K <.<.#.o./ (  .O.;.+.U z 2.2.2.2.2.2.2.w w w 2.2.2.2.2.2.",
+"2.2.2.J ,.,.P I L  .o.{ J B n z 2.2.2.2.2.w w w w 2.2.2.2.2.2.2.",
+"2.2.2.J >.%.I { b R W J u * H z 2.2.2.w w w w 2.2.2.2.2.2.2.2.2.",
+"2.2.2.H :.%.t r o.7 E -.| *.&., 2.2.w w w 2.2.2.2.2.2.2.2.2.2.2.",
+"2.2.2.S -.#.] ) y ' #. .>.<.1.& 2.u q 8 2 , , * 2.2.2.2.2.2.2.2.",
+"2.2.2.S =.O. .+.` } / / -.1.<.u u s K ,.<.:.J , * 2.2.2.2.2.2.2.",
+"2.2.2.C %.O.o.( / / / Z z z K u z ] u 2 , 8 S @.i # 2.2.2.2.2.2.",
+"2.2.2.C $.#. .( / o.[ F <.-.C u j 8 2 2.2.2.* , ! p # w 2.2.2.2.",
+"2.2.2.z #.#.#.( =.=.z *.:.-.@.u 0 w 2.2.w w w 9 & U ; 4 2.2.2.2.",
+"2.2.2.l O.#.-.@. .#.m -.%.#.#.s 2.w w w w w w 2.% 6 Y o 2.2.2.2.",
+"2.2.2.l O.#.N g h g c %.#.O.( p 2.w w w w w w w w + ( ; 2.2.2.2.",
+"2.2.2.s  .#.h  .A , i  .o.( ~ , w w 4 & , @ + 2.2.# / > 2.2.2.2.",
+"2.2.2.2 u ^ h a & & u c ( ( f 6 w : * +.:.D O 2.X a T O 2.2.2.2.",
+"2.2.2.2., , * w w w w 0 8 3 : w 2.& D -.%.#.: X $ T > . 2.2.2.2.",
+"2.2.2.2.2.2.2.2.w w w w w w 2.2.2.& U #.#.o.d + x = . 2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.+ U o. .( a # . . 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.w w w w w w $ M  ./ / ; . 2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w w w w w 6 # T ( x . 2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.X o = . . 2.2.2.2.2.2.2.2.2."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kaudiocreator-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/kaudiocreator-16.xpm
@@ -0,0 +1,209 @@
+/* XPM */
+static char *kaudiocreator-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 187 2",
+"   c black",
+".  c #08080C",
+"X  c #0E0F16",
+"o  c #170231",
+"O  c #1B1D2D",
+"+  c #24293B",
+"@  c #282C42",
+"#  c #2A2E43",
+"$  c #2F334F",
+"%  c #323950",
+"&  c #41476B",
+"*  c #444A72",
+"=  c #002399",
+"-  c #00239C",
+";  c #02249C",
+":  c #3F2692",
+">  c #283EB7",
+",  c #122AC6",
+"<  c #1F3BE1",
+"1  c #2838DF",
+"2  c #3A31DC",
+"3  c #3E48D7",
+"4  c #3547EE",
+"5  c #3648FF",
+"6  c #3652E4",
+"7  c #46249F",
+"8  c #4337EB",
+"9  c #555C88",
+"0  c #5B6594",
+"q  c #655DB2",
+"w  c #606898",
+"e  c #656B9C",
+"r  c #636BA0",
+"t  c #626FA3",
+"y  c #6772AA",
+"u  c #6E7EB8",
+"i  c #7179AD",
+"p  c #747EB7",
+"a  c #4651C9",
+"s  c #4650D8",
+"d  c #5E57DE",
+"f  c #485BE2",
+"g  c #4653F6",
+"h  c #4454F8",
+"j  c #4C60CE",
+"k  c #5262CB",
+"l  c #596ADC",
+"z  c #586DDF",
+"x  c #5469E0",
+"c  c #5C6AE1",
+"v  c #615CC6",
+"b  c #664EFF",
+"n  c #6277D6",
+"m  c #676AEB",
+"M  c #6669ED",
+"N  c #6D76EC",
+"B  c #6B75FE",
+"V  c #7478EA",
+"C  c #7C7DE9",
+"Z  c #7284BE",
+"A  c #7D85B2",
+"S  c #7A83BA",
+"D  c #7D89BD",
+"F  c #6A81DB",
+"G  c #7A86C5",
+"H  c #7C8DCD",
+"J  c #7C8ECE",
+"K  c #7480E2",
+"L  c #7783FE",
+"P  c #808ABC",
+"I  c #8E98CA",
+"U  c #8695DE",
+"Y  c #8598DE",
+"T  c #948EDD",
+"R  c #9A99D1",
+"E  c #859DEC",
+"W  c #8893E2",
+"Q  c #8A9CE1",
+"!  c #8D99F2",
+"~  c #8D98F6",
+"^  c #9499EE",
+"/  c #96A0D9",
+"(  c #9EA5D7",
+")  c #9DA7DF",
+"_  c #90A6EF",
+"`  c #98A5E1",
+"'  c #95A0F2",
+"]  c #93A9F4",
+"[  c #9EA7F3",
+"{  c #98A1FE",
+"}  c #A698D9",
+"|  c #A8ADDA",
+" . c #A6A8EF",
+".. c #AEAFE9",
+"X. c #A7B4E9",
+"o. c #ACB6E6",
+"O. c #AFB9E2",
+"+. c #AFBBE7",
+"@. c #A7B1F2",
+"#. c #A5B6F2",
+"$. c #A7B1FB",
+"%. c #BABEFE",
+"&. c #B3C1EC",
+"*. c #BBC7EB",
+"=. c #B8C5EE",
+"-. c #BEC7EE",
+";. c #BDC1F1",
+":. c #C2BEE8",
+">. c #C7C7EC",
+",. c #C4CAE4",
+"<. c #C1C9EB",
+"1. c #C5CFEE",
+"2. c #CDC7ED",
+"3. c #CCC7EE",
+"4. c #C8CDE6",
+"5. c #C4C4F0",
+"6. c #C4CFF8",
+"7. c #C6D0EF",
+"8. c #CDD3ED",
+"9. c #C3D1FA",
+"0. c #C2D3FE",
+"q. c #C5D1FA",
+"w. c #C6D8FF",
+"e. c #CAD2F0",
+"r. c #CBD5F7",
+"t. c #CBD3F8",
+"y. c #C8D4FD",
+"u. c #C8D6FF",
+"i. c #C8D8FF",
+"p. c #CDD8FD",
+"a. c #CCDAFF",
+"s. c #CCDDFF",
+"d. c #CEDEFF",
+"f. c #D0D1EE",
+"g. c #D2DDFF",
+"h. c #D2DEFE",
+"j. c #D2DEFF",
+"k. c #D4DFFF",
+"l. c #D9DBF3",
+"z. c #DADDF5",
+"x. c #DADDF6",
+"c. c #D7E4FF",
+"v. c #DDE4F4",
+"b. c #DEE4F6",
+"n. c #D9E5FF",
+"m. c #DAE4FF",
+"M. c #DAE5FF",
+"N. c #DBE5FF",
+"B. c #DDE1F8",
+"V. c #DCE4FB",
+"C. c #DFE8FF",
+"Z. c #E3E9FA",
+"A. c #E3ECFF",
+"S. c #E4EAFD",
+"D. c #E5EBFC",
+"F. c #E4EBFF",
+"G. c #E6EBFC",
+"H. c #E6EBFD",
+"J. c #E8EBF7",
+"K. c #EBEEF8",
+"L. c #E8EDFC",
+"P. c #E8EEFE",
+"I. c #E8EEFF",
+"U. c #E9EFFF",
+"Y. c #EDEFF8",
+"T. c #EAF0FF",
+"R. c #EDF0FB",
+"E. c #ECF1FF",
+"W. c #ECF2FF",
+"Q. c #EDF2FF",
+"!. c #EEF3FF",
+"~. c #F0F4FF",
+"^. c #F2F6FF",
+"/. c #F3F7FF",
+"(. c #F4F7FF",
+"). c #F5F8FF",
+"_. c #F6F8FF",
+"`. c #F6F9FF",
+"'. c #F7F9FF",
+"]. c #F7FAFF",
+"[. c #F8F9FF",
+"{. c #F8FAFE",
+"}. c #F8FAFF",
+"|. c #F8FBFF",
+" X c #F9FBFF",
+".X c #FAFAFF",
+"XX c None",
+/* pixels */
+"XXXX; a > Y ` ) R G y   XXXXXXXX",
+"XX- 2 b m U D.U.w.w.o.p & XXXXXX",
+"- = j 8 s g Y U.p.g.n.x.S # XXXX",
+"3 k q.<.K.c 6 U.c.n.Q.|.x.r   XX",
+"1 l V.1.|.W < Q.C.Q.|.|.(.| $   ",
+", g n K *.v.8.U.Z.|.|.(.x...q o ",
+"E z 4 5 f 7.S.O.,.K.@.' $.' L 7 ",
+"] 0.F x &.U.p.% A v.! N V C v 7 ",
+"_ g.U.(.(. XD.+.4.Y.^ %.V.g.e   ",
+"Z y.(.|. X XU.D.Y.|. .5.D.r.*   ",
+"XX#.(.(.|.Q.n.U.e.f.T 2.Q.( O   ",
+"XXJ q.(.^.c.d.=.[ %.~ 2.z.9     ",
+"XX  J r.n.d.w.-.m B d :.i .   XX",
+"XXXX  u X.q.i.D.>.} R w X   XXXX",
+"XXXXXX  + t D I P 0 #     XXXXXX",
+"XXXXXXXXXX              XXXXXXXX"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kmix-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/kmix-16.xpm
@@ -0,0 +1,202 @@
+/* XPM */
+static char *kmix-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 180 2",
+"   c black",
+".  c #000100",
+"X  c #010101",
+"o  c #000002",
+"O  c #000003",
+"+  c #000200",
+"@  c #000201",
+"#  c #030002",
+"$  c gray1",
+"%  c #000304",
+"&  c #030306",
+"*  c #000400",
+"=  c #000601",
+"-  c #000702",
+";  c #000706",
+":  c #000801",
+">  c #000B03",
+",  c #030803",
+"<  c #000B04",
+"1  c #000B06",
+"2  c #000C00",
+"3  c #000E04",
+"4  c #060B0C",
+"5  c #080208",
+"6  c #0E060E",
+"7  c #0F060F",
+"8  c #001300",
+"9  c #001800",
+"0  c #001B00",
+"q  c #001B02",
+"w  c #001906",
+"e  c #181818",
+"r  c #1A1A20",
+"t  c #002205",
+"y  c #002703",
+"u  c #002B01",
+"i  c #002C00",
+"p  c #003200",
+"a  c #003107",
+"s  c #003D00",
+"d  c #202020",
+"f  c #222222",
+"g  c #212128",
+"h  c #222228",
+"j  c #2C2C2C",
+"k  c gray18",
+"l  c #2F2F2F",
+"z  c #2B2A30",
+"x  c #2C2C32",
+"c  c #323232",
+"v  c #004000",
+"b  c #004400",
+"n  c #004D01",
+"m  c #0A460A",
+"M  c #005200",
+"N  c #005006",
+"B  c #005402",
+"V  c #005403",
+"C  c #005507",
+"Z  c #005D02",
+"A  c #005E02",
+"S  c #006100",
+"D  c #006600",
+"F  c #006603",
+"G  c #006900",
+"H  c #006A00",
+"J  c #006A05",
+"K  c #007000",
+"L  c #007300",
+"P  c #007004",
+"I  c #007005",
+"U  c #007104",
+"Y  c #007700",
+"T  c #007800",
+"R  c #007904",
+"E  c #007D00",
+"W  c #007F04",
+"Q  c #29442C",
+"!  c #324436",
+"~  c #413C41",
+"^  c #434343",
+"/  c #484849",
+"(  c #494949",
+")  c #4B4B4B",
+"_  c #4E4D4E",
+"`  c gray31",
+"'  c #585858",
+"]  c #5A5A5A",
+"[  c #5B5B5B",
+"{  c #5D5D5D",
+"}  c #5C5C5F",
+"|  c #5D5D64",
+" . c #606060",
+".. c gray38",
+"X. c #626262",
+"o. c gray39",
+"O. c #646464",
+"+. c #656565",
+"@. c gray40",
+"#. c #686868",
+"$. c DimGray",
+"%. c #6A6A6A",
+"&. c gray42",
+"*. c #69696F",
+"=. c #6C6C6C",
+"-. c gray43",
+";. c #706B70",
+":. c gray44",
+">. c #717171",
+",. c #727272",
+"<. c #747474",
+"1. c gray46",
+"2. c #767676",
+"3. c #777777",
+"4. c #797579",
+"5. c gray47",
+"6. c #797979",
+"7. c #7B7B7B",
+"8. c #7B7B7D",
+"9. c #7E7B7F",
+"0. c #7E7E7E",
+"q. c #008000",
+"w. c #008600",
+"e. c #008F00",
+"r. c #009100",
+"t. c #009300",
+"y. c #009500",
+"u. c #009A00",
+"i. c #009F00",
+"p. c #00A200",
+"a. c #00A700",
+"s. c #00AA01",
+"d. c #00AE02",
+"f. c #00B300",
+"g. c #00C900",
+"h. c #00CC00",
+"j. c #00D700",
+"k. c #00D701",
+"l. c #00D801",
+"z. c #00D900",
+"x. c #00DE01",
+"c. c #00EB01",
+"v. c #00F000",
+"b. c #00F901",
+"n. c #00FF01",
+"m. c #818181",
+"M. c gray51",
+"N. c #888888",
+"B. c #898989",
+"V. c #8C8C8F",
+"C. c gray56",
+"Z. c #908890",
+"A. c #909090",
+"S. c #939393",
+"D. c #959594",
+"F. c gray62",
+"G. c #9F9F9F",
+"H. c gray65",
+"J. c #A7A7A7",
+"K. c #A9A6AA",
+"L. c #AFAFAF",
+"P. c gray70",
+"I. c #B2B2B4",
+"U. c #B7B7B7",
+"Y. c #BCBCBC",
+"T. c gray",
+"R. c #C1BEC3",
+"E. c gray77",
+"W. c gray78",
+"Q. c gray79",
+"!. c #CACAC9",
+"~. c #CDCDCD",
+"^. c #CECECE",
+"/. c #D7D7D7",
+"(. c #DFDFDF",
+"). c #E4E4E3",
+"_. c #E9E9E9",
+"`. c #EDEDEC",
+"'. c gray100",
+"]. c None",
+/* pixels */
+"].].].f.g.k.k.k.x.k.k.y.V ].].].",
+"].].a.s.W V y < < q b L p.D ; ].",
+"].y.R t       ].].].    0 G C O ",
+"].I ;   ].].].T E L ].].].  A w ",
+"].a   ].q.h.c.b.n.c.u.A ].].u y ",
+"].  * Y d.I n p u s S r.J < ].* ",
+"].].G I 2     7 7 ].]., V N O ].",
+"].w.L 4 ~ _ -.G.H.6.B.9.5 b 1 ].",
+"].].Q -.8.1.$.@.<.C.H.U.K.!     ",
+"].Z.4.#.X.{ @.1.B.C.F.L.Q.R.j ].",
+"].1.$. .X.7.P.Q.W.E.P.T.^.).*.  ",
+"].[ =. .@.:.>.$.X.1.M.T.(._.|   ",
+"].l [ >.$./ c l l c o./.`.I.r   ",
+"].].e / >.M.6.1.7.S.Q.^.V.g     ",
+"].].].  f _ @.>.M.S.8.x &     ].",
+"].].].].  f ^ / [ } g       ].]."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kscd.xpm
+++ kdemultimedia-3.5.0/debian/icons/kscd.xpm
@@ -0,0 +1,230 @@
+/* XPM */
+static char *kscd[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 192 2",
+"   c #000000",
+".  c #010419",
+"X  c #020817",
+"o  c #020A1F",
+"O  c #030B20",
+"+  c #000E3C",
+"@  c #031136",
+"#  c #04133B",
+"$  c #3F3E3A",
+"%  c #001453",
+"&  c #061B55",
+"*  c #0B1E54",
+"=  c #091F5C",
+"-  c #0B205B",
+";  c #0D2872",
+":  c #38475B",
+">  c #403E3A",
+",  c #41403E",
+"<  c #4C5B6F",
+"1  c #42597E",
+"2  c #072787",
+"3  c #0E2B80",
+"4  c #082C8E",
+"5  c #102E85",
+"6  c #19368E",
+"7  c #1D3A94",
+"8  c #213F95",
+"9  c #1E44B1",
+"0  c #234296",
+"q  c #244398",
+"w  c #284EBB",
+"e  c #264DC0",
+"r  c #2654CC",
+"t  c #2857CE",
+"y  c #2C59CE",
+"u  c #3157C7",
+"i  c #3358C6",
+"p  c #335BCA",
+"a  c #315ED0",
+"s  c #385ED1",
+"d  c #3B61CC",
+"f  c #3662D1",
+"g  c #3A63D1",
+"h  c #3B6BD5",
+"j  c #566B8A",
+"k  c #4067C5",
+"l  c #4065CB",
+"z  c #4469CE",
+"x  c #4A6DCE",
+"c  c #416BD3",
+"v  c #496FD4",
+"b  c #4C7BCD",
+"n  c #4372D5",
+"m  c #4B71D5",
+"M  c #4A79DB",
+"N  c #5274D0",
+"B  c #577AD1",
+"V  c #537DDA",
+"C  c #5C7BD2",
+"Z  c #6F85A6",
+"A  c #7E96BB",
+"S  c #4D80DF",
+"D  c #5182D6",
+"F  c #5F82D6",
+"G  c #5C83DC",
+"H  c #5C8AD2",
+"J  c #5C8DDA",
+"K  c #5484E0",
+"L  c #5C8CE3",
+"P  c #5C95EE",
+"I  c #599EEF",
+"U  c #55A4EA",
+"Y  c #5AA2EE",
+"T  c #6482D6",
+"R  c #6385DE",
+"E  c #6589DB",
+"W  c #6B87D7",
+"Q  c #6B8CDC",
+"!  c #6A95D7",
+"~  c #6C91DB",
+"^  c #718DDA",
+"/  c #7492DC",
+"(  c #749DDA",
+")  c #7894DD",
+"_  c #7E9BD6",
+"`  c #7B9BDD",
+"'  c #628EE2",
+"]  c #6394EB",
+"[  c #679AE6",
+"{  c #6798EF",
+"}  c #6B93E2",
+"|  c #6B97EE",
+" . c #6D9AE4",
+".. c #6C9AE9",
+"X. c #6B96F0",
+"o. c #7194E0",
+"O. c #739CE4",
+"+. c #729FEB",
+"@. c #7997E0",
+"#. c #7D9CE3",
+"$. c #7EA1DF",
+"%. c #68A3EF",
+"&. c #6BAFEE",
+"*. c #74A0E6",
+"=. c #74A2EA",
+"-. c #71AFED",
+";. c #7CA1E4",
+":. c #79A5EC",
+">. c #7DA8E6",
+",. c #7CA8ED",
+"<. c #75A6F0",
+"1. c #7CA4F1",
+"2. c #7CABF0",
+"3. c #73B3F2",
+"4. c #7DB3F2",
+"5. c #78B8F3",
+"6. c #809EE3",
+"7. c #89A1C3",
+"8. c #8CA4CA",
+"9. c #88A5DC",
+"0. c #8EA9DF",
+"q. c #84A4E3",
+"w. c #80A2E9",
+"e. c #86A8E6",
+"r. c #84ACEC",
+"t. c #8AA5E4",
+"y. c #8BA9E5",
+"u. c #8CABE9",
+"i. c #83AEF1",
+"p. c #85B3EF",
+"a. c #8CB2EB",
+"s. c #82B2F1",
+"d. c #83BAF2",
+"f. c #8CB4F1",
+"g. c #8BBCF2",
+"h. c #92ACE5",
+"j. c #98ADE0",
+"k. c #93B4EC",
+"l. c #95BBEE",
+"z. c #9BB4E8",
+"x. c #9DBBE6",
+"c. c #9CBAEC",
+"v. c #90B6F1",
+"b. c #94BAF2",
+"n. c #9ABDF3",
+"m. c #A8BBD7",
+"M. c #B3BECF",
+"N. c #A4BCE5",
+"B. c #A3BCEB",
+"V. c #ABBFEB",
+"C. c #A3BFF1",
+"Z. c #93C1F4",
+"A. c #9DC1F2",
+"S. c #A0C0EF",
+"D. c #AAC3E6",
+"F. c #ACC2ED",
+"G. c #AEC8EE",
+"H. c #A2C1F1",
+"J. c #ABC4F1",
+"K. c #ADC9F3",
+"L. c #AAC9FB",
+"P. c #B3C6E3",
+"I. c #B0C4ED",
+"U. c #B5C8EE",
+"Y. c #BBCDE7",
+"T. c #BBCAEC",
+"R. c #B3C7F0",
+"E. c #B2CBF3",
+"W. c #BACDF1",
+"Q. c #BFD0EB",
+"!. c #B7D0F4",
+"~. c #BBD1F3",
+"^. c #C2CDDC",
+"/. c #C1CEEF",
+"(. c #C4D2E7",
+"). c #C3D2EB",
+"_. c #CBD5E3",
+"`. c #C9D6EA",
+"'. c #CDD9EC",
+"]. c #C2D3F2",
+"[. c #C5D9F4",
+"{. c #C6DBFA",
+"}. c #C9D6F2",
+"|. c #CBDBF3",
+" X c #C8DDFC",
+".X c #D2DCEB",
+"XX c #D7E1ED",
+"oX c #D3E1F7",
+"OX c #D2E2F9",
+"+X c #DEEAFA",
+"@X c #E0ECFB",
+"#X c None",
+/* pixels */
+"#X#X#X#X#X#X#X#X#X#X#X+XW.x.D.Y.Q.D.7.m.^.#X#X#X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X'.B.P._..XXX.X.XXXXX.X(.8.M.#X#X#X#X#X#X#X#X#X",
+"#X+ 4 6 2 % . #X1 P._.'.'..X.X'.XX'..X.X'.XXQ.j #X#X#X#X#X#X#X#X",
+"= R }.}.}.B.} p 9._._.`.`.`.`.'.}.'.'.'.|.'.'.|.A   #X#X#X#X#X#X",
+"e /./.]./.].}.|.j.B _ (.`.`.`.'.'.|.|.|.|.[.'.[.|.Z #X#X#X#X#X#X",
+"x /././././.}.}.}.}.N.F / T.[.[.[.[.[.[.[.{.{.|.[.{.: #X#X#X#X#X",
+"C T.W.W.~.[.}.}.].].].].B.E W z.~.[.OX X X X X X{.{.G.  #X#X#X#X",
+"C V.R.E.!.].[.[.].].].W.~.Q.U.y./ E E Q E E G L } ;.L.< #X#X#X#X",
+"C V.V.R.!.Q.~.[.~.~.~.~.~.W.E.I.I.U.F.F.R.R.J.V.V.u.} k &   #X#X",
+"C B.C.J.!.!.~.~.~.~.~.~.!.F.N.B.B.B.B.J.V.V.K.K.J.V.V.B.W 9   #X",
+"N z.C.C.K.U.U.!.!.!.~.!.K.N.J.H.C.C.C.C.K.J.K.K.K.J.C.C.j.) ;   ",
+"m h.k.C.G.G.K.K.K.K.K.K.c.n.H.H.H.H.C.C.J.C.E.E.K.K.J.C.h.h.i   ",
+"x 6.u.b.B.B.S.S.A.A.H.A.l.n.n.n.n.n.n.n.S.S.W.E.E.K.J.F.0.6.l . ",
+"x 6.t.a.c.k.c.c.A.A.H.n.b.k.b.b.b.b.b.b.A.S.E.L.L.K.K.H.9.6.v o ",
+"x @.6.r.k.k.l.l.n.b.A.b.b.a.f.f.v.f.v.g.g.l.A.H.K.K.K.n.` #.v o ",
+"l / +.r.a.h.k.l.l.b.Z.b.v.f.p.f.f.<.I U U 3.5.2.4.s.r.=.b v p O ",
+"d } O.:.r.a.a.l.b.b.b.b.v.f.f.1.] P I Y &.3.3.5.4.p.4.J n f r o ",
+"d Q o.:.,.a.k.v.f.b.b.b.n.f.+.| X.{ %.&.3.5.3.5.5.p.4.b M h y o ",
+"d E } =.,.r.a.a.b.b.n.g.s.2.s.r.i.2.4.5.5.5.5.4.d.d.O.D M n y o ",
+"d E } =.,.,.a.a.+.;.;.*.*...g.,.s.d.d.d.d.d.g.d.d.p.H L K M y o ",
+"p G } +.:.2.,. .y.W.W.W.W.y.*.~ #.;.g.g.g.g.g.g.g.! [ ] L M p O ",
+"p G E ..=.<.<.} W.+X+X+X+XT.;.e.].W.y.>.Z.Z.n.g.( ..=...' V f O ",
+"d E } +.<.2.,.O.W.+X@X@X+XW.q.y.|.@XOXF.q.a.a.$.*.2.:.=.} E f o ",
+"d h.;.;.;.k.e.O.W.+X@X@X+X!.e.y.|.@X+X+X|.c.~ ,.e.k.;.:.;.y.a O ",
+"d k.y.y.].@XB.;.W.@X@X@X+XW.$.e.|.@X+X@X+X~.) +.c.@X].u.e.y.g O ",
+"z h.u.t.~.@Xc.#.W.+X+X@X+XW.;.q.|.+X+X|.B.6.u.v.N.@X~.u.u.h.g O ",
+"l h.q.u.r.z.e.q.W.@X+X+X@XW.q.e.OXOXW.q.e.b.b.c.e.k.u.u.q.y.s o ",
+"i ^ ` u.k.k.a.@.V.|.|.|. XB.` #.B.h.;.h.c.k.k.v.k.k.h.u.#.W p X ",
+"w ^ ) 6.q.u.u.q.~ q.q.q.q.Q t.} / e.u.u.u.u.u.u.u.u.e.q.) W e   ",
+"& s C ^ @.#.6.#.6.#.#.6.#.6.#.6.6.6.6.6.#.6.6.6.6.6.@.^ C g =   ",
+"#X@ 5 7 8 q 8 q q q q q q q q q q q q q q q q q 8 8 0 7 5 #     ",
+"#X#X> > $ $ $ $ $ $ $ $ $ > $ $ $ $ $ > $ > > > > > > > > , #X#X"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/krec.xpm
+++ kdemultimedia-3.5.0/debian/icons/krec.xpm
@@ -0,0 +1,198 @@
+/* XPM */
+static char *krec[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 160 2",
+"   c black",
+".  c #173517",
+"X  c #343434",
+"o  c #3C3C3B",
+"O  c #1E461E",
+"+  c #204920",
+"@  c #294429",
+"#  c #2C482C",
+"$  c #265626",
+"%  c #275927",
+"&  c #2C532C",
+"*  c #295E29",
+"=  c #344E34",
+"-  c #395239",
+";  c #2B652B",
+":  c #2E682E",
+">  c #3D663D",
+",  c #357835",
+"<  c #3A743A",
+"1  c #3B7E3B",
+"2  c #433A36",
+"3  c #413B3A",
+"4  c #503227",
+"5  c #58392E",
+"6  c #603C2F",
+"7  c #56423B",
+"8  c #6C402F",
+"9  c #6C483A",
+"0  c #77412D",
+"q  c #754432",
+"w  c #774C3B",
+"e  c #7A4532",
+"r  c #7D4A36",
+"t  c #404040",
+"y  c #4B4B4B",
+"u  c #455D45",
+"i  c #504D4C",
+"p  c #565656",
+"a  c #5D5856",
+"s  c gray37",
+"d  c #4E654E",
+"f  c #457745",
+"g  c #5C725C",
+"h  c #66524B",
+"j  c #685D59",
+"k  c #765042",
+"l  c #765E55",
+"z  c #7A5E52",
+"x  c #746058",
+"c  c #646464",
+"v  c #686868",
+"b  c #617561",
+"n  c #7A7776",
+"m  c #7A7A79",
+"M  c #3A843A",
+"N  c #3C8A3C",
+"B  c #478947",
+"V  c #409340",
+"C  c #449C44",
+"Z  c #529052",
+"A  c #5D935D",
+"S  c #46A146",
+"D  c #48A448",
+"F  c #4BAB4B",
+"G  c #4EB24E",
+"H  c #55A455",
+"J  c #58AB58",
+"K  c #50B750",
+"L  c #54BC54",
+"P  c #5FB05F",
+"I  c #5ABA5A",
+"U  c #638A63",
+"Y  c #6F886F",
+"T  c #748574",
+"R  c #61A461",
+"E  c #61A961",
+"W  c #69A469",
+"Q  c #69AF69",
+"!  c #63B663",
+"~  c #65BA65",
+"^  c #6AB16A",
+"/  c #6BBA6B",
+"(  c #70A070",
+")  c #73B573",
+"_  c #55C255",
+"`  c #5ACB5A",
+"'  c #5CD35C",
+"]  c #5FD85F",
+"[  c #61C161",
+"{  c #60CA60",
+"}  c #69C869",
+"|  c #64D464",
+" . c #61DC61",
+".. c #68D068",
+"X. c #71C171",
+"o. c #75CC75",
+"O. c #7FC87F",
+"+. c #76D276",
+"@. c #71DA71",
+"#. c #7AD17A",
+"$. c #7FD97F",
+"%. c #64E364",
+"&. c #66E966",
+"*. c #6BE06B",
+"=. c #6BEB6B",
+"-. c #70E470",
+";. c #76EC76",
+":. c #78EC78",
+">. c #84452F",
+",. c #834731",
+"<. c #804A36",
+"1. c #854D39",
+"2. c #83523F",
+"3. c #8C503A",
+"4. c #93543C",
+"5. c #855441",
+"6. c #875D4D",
+"7. c #8C5946",
+"8. c #9A5A42",
+"9. c #8A6355",
+"0. c #88675B",
+"q. c #906555",
+"w. c #8C7268",
+"e. c #937266",
+"r. c #A35F45",
+"t. c #A56045",
+"y. c #B46B4F",
+"u. c #B66C50",
+"i. c #84817F",
+"p. c #808080",
+"a. c gray55",
+"s. c gray59",
+"d. c #81BB81",
+"f. c #AD9085",
+"g. c #A29F9E",
+"h. c #AAA19D",
+"j. c #A8A2A0",
+"k. c #ABAAAA",
+"l. c #A9BFA9",
+"z. c #B2B2B2",
+"x. c #B9B9B9",
+"c. c #81D281",
+"v. c #83D883",
+"b. c #90C790",
+"n. c #95D195",
+"m. c #93DE93",
+"M. c #98D898",
+"N. c #83EC83",
+"B. c #9EF39E",
+"V. c #AEC8AE",
+"C. c #A0DBA0",
+"Z. c #A1ECA1",
+"A. c #C6C6C6",
+"S. c #C9C9C9",
+"D. c #D5D5D5",
+"F. c #DADADA",
+"G. c #D5E2D5",
+"H. c #DEF5DE",
+"J. c #E4DAD7",
+"K. c None",
+/* pixels */
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.H.B ( K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.b.H ^ K.K.^ M A K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.~ S Q K.m.D N 1 K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.~ D C H @.C N Z K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.I D S d.| C N Q K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.M._ N : O.] D H K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.` _ ; . c. .F J K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.' ` $ . v.&.F / K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.` ] ; . X.&.L / K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.C.%., . Y %.] I K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.*.F . u @.=._ n.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.k.X o k.K.K.@. .+ # M. .&.[ K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.p o o o t c K.#.&.V . g #.%.&.v.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.p o o t t o X v K.| %.% @ K.o.%.&.;.B.K.K.K.K.K.K.Z.",
+"K.K.K.K.K.D.t o t t t o X o K.o.%.` O d K.) { %.&.:.=.N.N.*.../ ",
+"K.K.K.K.K.a.X o t t t o o X m K.+.%._ + b K.K.) / I [ I J R U K.",
+"K.K.K.K.K.s.X o o t t 3 o X y K.K.#.%.' * - u K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.y X o t t o o X o K.K.K.o. .&.C & u T K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.c X p.x.m o o 7 w e.K.K.K./ `  . .F < > = f H ) C ) ",
+"K.K.K.K.K.K.p.m F.D.S.h r 4.1.5.K.K.K.K.G.! } `  .' ` L G G G F ",
+"K.K.K.K.K.K.S.S.S.S.S.0.8.t.8.7.J.K.K.K.K.K.K.V.P ! G G G H W V.",
+"K.K.K.K.K.S.S.S.S.S.h.r >.4.4.1.9.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.S.S.S.A.A.h.5.y.y.4.3.0 q.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.S.S.S.A.A.g.4 8.r.y.y.8.1.6.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.A.S.S.S.A.z.2 q 8.r.4.,.1.e k K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.S.S.S.A.A.k.y a 1.1.4.4.1.r 6 z K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"F.S.S.S.S.k.2 o K.f.w q q 8 5 x K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.x.A.A.z.3 i.K.K.K.w.9 x 7 j K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"S.S.z.x.m n K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"S.A.z.z.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"A.x.x.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"x.x.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kmid.xpm
+++ kdemultimedia-3.5.0/debian/icons/kmid.xpm
@@ -0,0 +1,251 @@
+/* XPM */
+static char *kmid[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 213 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #040404",
+"+  c gray2",
+"@  c #060606",
+"#  c #070707",
+"$  c gray3",
+"%  c gray4",
+"&  c #0B0B0B",
+"*  c #0C0C0C",
+"=  c gray5",
+"-  c #0E0E0E",
+";  c gray6",
+":  c #101010",
+">  c #111111",
+",  c gray7",
+"<  c gray8",
+"1  c #151515",
+"2  c #161616",
+"3  c gray9",
+"4  c #181818",
+"5  c #191919",
+"6  c gray10",
+"7  c #1B1B1B",
+"8  c gray11",
+"9  c #1D1D1D",
+"0  c #1E1E1E",
+"q  c gray12",
+"w  c #202020",
+"e  c gray13",
+"r  c #222222",
+"t  c #232323",
+"y  c gray14",
+"u  c #252525",
+"i  c gray15",
+"p  c #272727",
+"a  c #282828",
+"s  c gray16",
+"d  c #2A2A2A",
+"f  c gray17",
+"g  c #2C2C2C",
+"h  c #2D2D2D",
+"j  c gray18",
+"k  c #2F2F2F",
+"l  c gray19",
+"z  c #313131",
+"x  c #323232",
+"c  c gray20",
+"v  c #343434",
+"b  c #353535",
+"n  c gray21",
+"m  c #373737",
+"M  c gray22",
+"N  c #393939",
+"B  c #3A3A3A",
+"V  c gray23",
+"C  c #3C3C3C",
+"Z  c gray24",
+"A  c #3E3E3E",
+"S  c #3F3F3F",
+"D  c gray25",
+"F  c #414141",
+"G  c gray26",
+"H  c #434343",
+"J  c #444444",
+"K  c gray27",
+"L  c #464646",
+"P  c gray28",
+"I  c #484848",
+"U  c #494949",
+"Y  c #4B4B4B",
+"T  c #4C4C4C",
+"R  c gray30",
+"E  c #4E4E4E",
+"W  c gray31",
+"Q  c #505050",
+"!  c #515151",
+"~  c gray32",
+"^  c #535353",
+"/  c gray33",
+"(  c #555555",
+")  c #565656",
+"_  c gray34",
+"`  c #585858",
+"'  c gray35",
+"]  c #5A5A5A",
+"[  c #5B5B5B",
+"{  c gray36",
+"}  c #5D5D5D",
+"|  c gray37",
+" . c #5F5F5F",
+".. c #606060",
+"X. c gray38",
+"o. c #626262",
+"O. c gray39",
+"+. c #646464",
+"@. c #656565",
+"#. c #676767",
+"$. c #686868",
+"%. c DimGray",
+"&. c #6A6A6A",
+"*. c gray42",
+"=. c #6C6C6C",
+"-. c #6D6D6D",
+";. c gray43",
+":. c #6F6F6F",
+">. c gray44",
+",. c gray45",
+"<. c #747474",
+"1. c gray46",
+"2. c #777777",
+"3. c gray47",
+"4. c #797979",
+"5. c gray48",
+"6. c #7B7B7B",
+"7. c gray49",
+"8. c gray50",
+"9. c #808080",
+"0. c #818181",
+"q. c gray51",
+"w. c #838383",
+"e. c #848484",
+"r. c #868686",
+"t. c #888888",
+"y. c gray54",
+"u. c #8B8B8B",
+"i. c gray55",
+"p. c #8E8E8E",
+"a. c gray57",
+"s. c #939393",
+"d. c gray58",
+"f. c gray59",
+"g. c #979797",
+"h. c gray60",
+"j. c #9A9A9A",
+"k. c #9B9B9B",
+"l. c gray61",
+"z. c #9D9D9D",
+"x. c #9F9F9F",
+"c. c #A0A0A0",
+"v. c gray63",
+"b. c #A2A2A2",
+"n. c gray64",
+"m. c #A4A4A4",
+"M. c #A5A5A5",
+"N. c gray65",
+"B. c #A7A7A7",
+"V. c gray66",
+"C. c #A9A9A9",
+"Z. c #AAAAAA",
+"A. c #ACACAC",
+"S. c gray68",
+"D. c #AEAEAE",
+"F. c #AFAFAF",
+"G. c gray69",
+"H. c #B2B2B2",
+"J. c gray70",
+"K. c #B4B4B4",
+"L. c gray71",
+"P. c #B6B6B6",
+"I. c #B7B7B7",
+"U. c gray72",
+"Y. c gray73",
+"T. c #BBBBBB",
+"R. c #BCBCBC",
+"E. c gray74",
+"W. c gray",
+"Q. c gray75",
+"!. c #C0C0C0",
+"~. c #C1C1C1",
+"^. c #C3C3C3",
+"/. c gray77",
+"(. c #C5C5C5",
+"). c #C6C6C6",
+"_. c gray78",
+"`. c #C8C8C8",
+"'. c gray79",
+"]. c gray80",
+"[. c #CECECE",
+"{. c #D2D2D2",
+"}. c LightGray",
+"|. c #D5D5D5",
+" X c gray84",
+".X c #D8D8D8",
+"XX c gray85",
+"oX c #DADADA",
+"OX c gray86",
+"+X c #DDDDDD",
+"@X c gray87",
+"#X c #DFDFDF",
+"$X c #E1E1E1",
+"%X c gray89",
+"&X c gray90",
+"*X c #E6E6E6",
+"=X c gray91",
+"-X c #EEEEEE",
+";X c #EFEFEF",
+":X c gray94",
+">X c #F1F1F1",
+",X c gray95",
+"<X c #F3F3F3",
+"1X c #F4F4F4",
+"2X c gray96",
+"3X c #F6F6F6",
+"4X c #F9F9F9",
+"5X c gray98",
+"6X c #FBFBFB",
+"7X c #FDFDFD",
+"8X c #FEFEFE",
+"9X c gray100",
+"0X c None",
+/* pixels */
+"                        0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"          @   @ @   $     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ 3 3 3 6 q q r N l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ q y a g l l G 2.N     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ r a v N N C ! 7.l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ q a v C C G ( 7.l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"    r g N C G J ] 7.g     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"0X@ r g N G J J | 0.g     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"0X@ r l N G Y J o.0.a     0X0X0X0X0X0X0X0X              0X0X0X  ",
+"0X  r v G J Y Y @.0.a     0X0X0X0X0X0X    @               @     ",
+"0X  r v C J R R @.0.y     0X0X0X0X0X=   G o.N C C C C C v 6     ",
+"0X  r N C Y Y ! &.7.r @   0X0XJ.| g = J '.B.&.-.-.>.-.! y @     ",
+"0X  r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6         ",
+"0X  q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C =       0X0X",
+"0X  q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @       0X0X0X",
+"0X  3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r     0X0X0X0X0X",
+"0X  = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X",
+"0X  J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X",
+"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.]     0X0X0X",
+"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r     0X0X0X",
+"0X  6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@     0X0X0X",
+"0X  $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6       0X0X0X",
+"0X  @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J           0X0X0X",
+"0X  @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C         = 0X0X0X0X",
+"0X  @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r       0X0X0X0X0X0X",
+"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r       0X0X0X0X0X",
+"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3     0X0X0X0X0X",
+"0X0X  r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @     0X0X0X0X",
+"0X0X  r v N C G J v y J | &.o.N :   = C R ( ] ] ] l @     0X0X0X",
+"0X0X  3 6 6 3 6 6 6                   y y q q q r r =       0X0X",
+"0X0X                                                          0X",
+"0X0X                            0X0X0X                        0X"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/juk.xpm
+++ kdemultimedia-3.5.0/debian/icons/juk.xpm
@@ -0,0 +1,256 @@
+/* XPM */
+static char *juk[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 218 2",
+"   c #000000",
+".  c #060508",
+"X  c #000A04",
+"o  c #000E0A",
+"O  c #0A0A0C",
+"+  c #0D0D11",
+"@  c #00140A",
+"#  c #001A0B",
+"$  c #001210",
+"%  c #111115",
+"&  c #18181D",
+"*  c #1C1C22",
+"=  c #002108",
+"-  c #002315",
+";  c #00231F",
+":  c #00320B",
+">  c #003808",
+",  c #003216",
+"<  c #023A14",
+"1  c #003B1D",
+"2  c #002523",
+"3  c #002F27",
+"4  c #002B29",
+"5  c #003323",
+"6  c #003128",
+"7  c #003C21",
+"8  c #003A2A",
+"9  c #003431",
+"0  c #003A31",
+"q  c #25252C",
+"w  c #292932",
+"e  c #302B38",
+"r  c #32323C",
+"t  c #353541",
+"y  c #393342",
+"u  c #393943",
+"i  c #3E3E4B",
+"p  c #00410B",
+"a  c #004B0E",
+"s  c #004414",
+"d  c #00421B",
+"f  c #004B12",
+"g  c #024C1C",
+"h  c #005607",
+"j  c #00540D",
+"k  c #005B0D",
+"l  c #005312",
+"z  c #01511F",
+"x  c #005911",
+"c  c #004323",
+"v  c #00422A",
+"b  c #004A21",
+"n  c #005121",
+"m  c #0B5322",
+"M  c #085A21",
+"N  c #144F2C",
+"B  c #006D0D",
+"V  c #006C13",
+"C  c #026A19",
+"Z  c #057214",
+"A  c #06761A",
+"S  c #007C16",
+"D  c #09711E",
+"F  c #0E7D1A",
+"G  c #0F6825",
+"H  c #0F6D2B",
+"J  c #0E7629",
+"K  c #157526",
+"L  c #247C2E",
+"P  c #347E3B",
+"I  c #237D40",
+"U  c #356746",
+"Y  c #41404C",
+"T  c #444354",
+"R  c #4B465A",
+"E  c #494957",
+"W  c #4B4B5B",
+"Q  c #4D5460",
+"!  c #545464",
+"~  c #565669",
+"^  c #5B5B64",
+"/  c #59596A",
+"(  c #5D5D70",
+")  c #457852",
+"_  c #507A55",
+"`  c #64646E",
+"'  c #616174",
+"]  c #65647B",
+"[  c #6A6A7B",
+"{  c #71717D",
+"}  c #6B6B82",
+"|  c #747483",
+" . c #72728C",
+".. c #7A7A86",
+"X. c #7B7B8C",
+"o. c #757693",
+"O. c #7A7A95",
+"+. c #7D7C99",
+"@. c #00820C",
+"#. c #008312",
+"$. c #00871A",
+"%. c #028819",
+"&. c #0D881E",
+"*. c #0A931F",
+"=. c #048123",
+"-. c #0E8325",
+";. c #009226",
+":. c #00952A",
+">. c #148B27",
+",. c #14952B",
+"<. c #00A109",
+"1. c #00A612",
+"2. c #00A618",
+"3. c #00BF08",
+"4. c #00AA25",
+"5. c #00AC2A",
+"6. c #0DA621",
+"7. c #11AD29",
+"8. c #19BB2A",
+"9. c #31823A",
+"0. c #22A237",
+"q. c #29BE3B",
+"w. c #3FA256",
+"e. c #35B445",
+"r. c #3EB04D",
+"t. c #02C513",
+"y. c #00C11E",
+"u. c #0AC51C",
+"i. c #00D50E",
+"p. c #02DB0D",
+"a. c #00D413",
+"s. c #00DA16",
+"d. c #05DF18",
+"f. c #0BDB14",
+"g. c #03E50F",
+"h. c #02EC0C",
+"j. c #26CF36",
+"k. c #22DC2F",
+"l. c #26E629",
+"z. c #5A805E",
+"x. c #44B956",
+"c. c #4CB25E",
+"v. c #48BE56",
+"b. c #618B63",
+"n. c #6B9D6B",
+"m. c #4BCA57",
+"M. c #53CD5F",
+"N. c #47EB45",
+"B. c #42E94D",
+"V. c #5BF65D",
+"C. c #5CE763",
+"Z. c #77DE7F",
+"A. c #61EE5F",
+"S. c #6EF76A",
+"D. c #74E97A",
+"F. c #867FA3",
+"G. c #818193",
+"H. c #81819E",
+"J. c #8B8B9B",
+"K. c #889B91",
+"L. c #8686A0",
+"P. c #8D85AB",
+"I. c #8C8CA1",
+"U. c #9393A5",
+"Y. c #9494AA",
+"T. c #959CA5",
+"R. c #9999A7",
+"E. c #9A9AAD",
+"W. c #9B96B3",
+"Q. c #9C9CB2",
+"!. c #91A69B",
+"~. c #9DA5A5",
+"^. c #9CA5A9",
+"/. c #9EBEA1",
+"(. c #A6A9AE",
+"). c #A2A2B4",
+"_. c #A4A4BA",
+"`. c #ABA9B7",
+"'. c #ABABBD",
+"]. c #ABB2AF",
+"[. c #B2B2BF",
+"{. c #ADADC0",
+"}. c #B3AEC6",
+"|. c #B1B1C4",
+" X c #B6B6C8",
+".X c #BBBAC7",
+"XX c #BABACA",
+"oX c #80FF83",
+"OX c #9BF79F",
+"+X c #9AFB9B",
+"@X c #9FF5A2",
+"#X c #A1FFA0",
+"$X c #AEFFAD",
+"%X c #C2C1CE",
+"&X c #C3C3D3",
+"*X c #CCC7D4",
+"=X c #C9C9D6",
+"-X c #CDCDDA",
+";X c #D2CDDC",
+":X c #D2D2DD",
+">X c #D5D4E1",
+",X c #DAD7E5",
+"<X c #DADAE4",
+"1X c #DDDCE8",
+"2X c #CDFFCA",
+"3X c #D7E4D4",
+"4X c #DCFFD8",
+"5X c #E1DBE9",
+"6X c #E3E2EB",
+"7X c #E9E4EB",
+"8X c #E8E8EF",
+"9X c #EBE6F3",
+"0X c #ECECF2",
+"qX c #F0EAF6",
+"wX c #F2F1F5",
+"eX c #F5F5F9",
+"rX c #FEFEFE",
+"tX c None",
+/* pixels */
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX0 4 tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXv =.$ tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX3 x.w.@ tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX3 I 2Xc.1 3 tXtXtXtXtXtXtXtXtXtX/ | J.J.[ ! tXtXtXtX",
+"tXtXtXtXtXtXtXn @X4XZ.G 5 tXtXtXtXtXtXtXtX' Y.J.` | '.U.W tXtXtX",
+"tXtXtXtXtXtXtX7 m.D.$X#Xx.b 5 tXtXtXtXtX( Q.{ .     * `.X.  tXtX",
+"tXtXtXtXtXtXtX5 0.,.G x.oXC.M   tXtXtXtXF.R.X tXtXtXtXW XXw tXtX",
+"tXtXtXtXtXtXtX1 J j.X X s e.B.g   tXtX] E.^ tXtXtXtXtX' ).` tXtX",
+"tXtXtXtXtXtXtXtXg j.< tX  X -.7.@ tXtX} '.Y tXtXtXtXtXtXU...tXtX",
+"tXtXtXtXtXtXtXtXd 8.J   tXtXd S m R ! / ^.[ ~ / / tXtX[ E.[ tXtX",
+"tXtXtXtXtXtXtXtXd *.6.X tXtXQ N m `..X[.XXXX|.J.i tXtX .{.u tXtX",
+"tXtXtXtXtXtXtXtXtXC u.= tX/ ] T.!.-X-X*X'.'.%XJ.u tX .W.J.. tXtX",
+"tXtXtXtXtXtXtXtXtXl t.l R X.&X0X>XXX X|.).J.=XG.[ L.Q.E.* tXtXtX",
+"tXtXtXtXtXtXj a a s 1.#.O.5X8X;X=X%XXX|.|.XX&XG.} G./ % tXtXtXtX",
+"tXtXtXtXa h A >.%.V #.<.K.9X:X-X=XXXXX|._.Q.{.O.i     tXtXtXtXtX",
+"tXtXtXj Z M.OX+XV.h.i.3.) 1X:X-X&X&XXX|.'.).{.X.( tXtXtXtXtXtXtX",
+"tXtXj B k.S.A.N.l.g.h.p.K &X<X-X=X&XXX}.'.'.'.} ( tXtXtXtXtXtXtX",
+"tXtXh 2.d.f.p.p.a.a.a.s.#.~.1X-X=XXXXX|. X'.[ u tXtXtXtXtXtXtXtX",
+"tXF.U 2.y.y.y.y.3.5.y.y.Z (.<X-X=XXXXX&X)./ & tXtXtXtXtXtXtXtXtX",
+"tX+.^.&.4.5.5.5.5.5.5.%._ ;X:X-X&X=X&XY./ % tXtXtXtXtXtXtXtXtXtX",
+"tXO.W./.F %.;.:.;.%.Z z.*X<X:X-X>XXXO.W E tXtXtXtXtXtXtXtXtXtXtX",
+"tXtXo.}.3Xn.9.L 9.b.].6X6X>X<X<X{.} t tXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtX+.o.=XrXqX7X7XqX0X6X<X6X-XU.W + tXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtX+.O.<XrXeXwX0X6X0X6X X} w tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXo.J.0XeX0X0X0X-XL.T + tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXo.Y.eXrX6XQ.( * tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXo.Q.|.} w   tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX+.+.r .   tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/noatun-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/noatun-16.xpm
@@ -0,0 +1,225 @@
+/* XPM */
+static char *noatun-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 203 2",
+"   c black",
+".  c #081C3E",
+"X  c #1E1F24",
+"o  c #002300",
+"O  c #002500",
+"+  c #263B25",
+"@  c #1B6616",
+"#  c #1E6617",
+"$  c #234D20",
+"%  c #2F4029",
+"&  c #294E27",
+"*  c #265029",
+"=  c #27502B",
+"-  c #295328",
+";  c #305029",
+":  c #20781A",
+">  c #267920",
+",  c #3A753B",
+"<  c #39755B",
+"1  c #4F4B56",
+"2  c #4F4B57",
+"3  c #425F5F",
+"4  c #4B5C52",
+"5  c #4F7355",
+"6  c #517457",
+"7  c #6D686E",
+"8  c #6C6F6B",
+"9  c #677172",
+"0  c #6C7477",
+"q  c #6E7E79",
+"w  c #706971",
+"e  c gray45",
+"r  c #1D3782",
+"t  c #326096",
+"y  c #425FAC",
+"u  c #4D7392",
+"i  c #586087",
+"p  c #5E6486",
+"a  c #4868B2",
+"s  c #6E7595",
+"d  c #4779DC",
+"f  c #5772C0",
+"g  c #4D7AE7",
+"h  c #059A00",
+"j  c #0CA600",
+"k  c #09A800",
+"l  c #1FAE13",
+"z  c #27842D",
+"x  c #2D9A25",
+"c  c #3B9835",
+"v  c #2EA024",
+"b  c #34AE2A",
+"n  c #3DB134",
+"m  c #268A68",
+"M  c #3FC033",
+"N  c #51BE3E",
+"B  c #45877B",
+"V  c #49A442",
+"C  c #58AB53",
+"Z  c #5DAA57",
+"A  c #5FAD5B",
+"S  c #57BC4F",
+"D  c #58B456",
+"F  c #5EBB57",
+"G  c #5EBC58",
+"H  c #63985D",
+"J  c #649B68",
+"K  c #69906F",
+"L  c #6A9D6E",
+"P  c #6C9074",
+"I  c #61A75F",
+"U  c #65A762",
+"Y  c #6BAA68",
+"T  c #67B969",
+"R  c #6EBE6B",
+"E  c #6DBC6E",
+"W  c #6CB379",
+"Q  c #78AB74",
+"!  c #7AAC78",
+"~  c #7BB777",
+"^  c #59C94E",
+"/  c #6EC666",
+"(  c #6FC368",
+")  c #6ACD60",
+"_  c #6DCB63",
+"`  c #6FD165",
+"'  c #7CCD75",
+"]  c #77D96E",
+"[  c #7DD374",
+"{  c #7FDA74",
+"}  c #5784DF",
+"|  c #6483D9",
+" . c #778BD1",
+".. c #7A92D2",
+"X. c #628CE2",
+"o. c #668EE1",
+"O. c #658EEC",
+"+. c #6C92E2",
+"@. c #6F91E6",
+"#. c #6A9AEE",
+"$. c #6A93F0",
+"%. c #7498E5",
+"&. c #779FEC",
+"*. c #7B9DE5",
+"=. c #6DA0ED",
+"-. c #6EA1EF",
+";. c #76A4EE",
+":. c #76A5EE",
+">. c #7DA0E6",
+",. c #7AAAEF",
+"<. c #7EA8EF",
+"1. c #7EABEF",
+"2. c #75A5F0",
+"3. c #7CAAF0",
+"4. c #7EACF0",
+"5. c #80CD7A",
+"6. c #87CA7C",
+"7. c #80D278",
+"8. c #94979C",
+"9. c #9696A5",
+"0. c #9993A9",
+"q. c #82BF84",
+"w. c #ADADB6",
+"e. c #A0BCAC",
+"r. c #B6ACBF",
+"t. c #8299D7",
+"y. c #80ADEF",
+"u. c #81ADEF",
+"i. c #81ADF1",
+"p. c #80AEF1",
+"a. c #8DAFF1",
+"s. c #88B2F1",
+"d. c #88B3F0",
+"f. c #89B3F0",
+"g. c #89B3F1",
+"h. c #90ACE9",
+"j. c #91AFEA",
+"k. c #90B3F0",
+"l. c #91B6F1",
+"z. c #92B8F1",
+"x. c #93B9F1",
+"c. c #92B9F2",
+"v. c #93B9F3",
+"b. c #94B9F1",
+"n. c #94B9F2",
+"m. c #94B9F3",
+"M. c #94BAF2",
+"N. c #9BB0F2",
+"B. c #9DB6F5",
+"V. c #AFB2D4",
+"C. c #BCBDD3",
+"Z. c #BDBED3",
+"A. c #BCBDD4",
+"S. c #BDBED4",
+"D. c #BFBFD4",
+"F. c #BBB8DB",
+"G. c #85C881",
+"H. c #8CCC87",
+"J. c #8DD885",
+"K. c #91CE8E",
+"L. c #91DD88",
+"P. c #96D292",
+"I. c #9FD69B",
+"U. c #9ADA92",
+"Y. c #9BDC94",
+"T. c #9DDE95",
+"R. c #9DDB98",
+"E. c #97E28F",
+"W. c #A1DA9C",
+"Q. c #A2E49B",
+"!. c #A5EA9E",
+"~. c #AAE9A2",
+"^. c #B4E6AA",
+"/. c #B6E9AF",
+"(. c #B6EFAE",
+"). c #B6EAB1",
+"_. c #B8EDB3",
+"`. c #BAEFB4",
+"'. c #A4C1F2",
+"]. c #A4C3F4",
+"[. c #A5C4F3",
+"{. c #A6C5F3",
+"}. c #A6C5F4",
+"|. c #A6C5F5",
+" X c #A7C6F4",
+".X c #ABC2F2",
+"XX c #B9D0F6",
+"oX c #B9D2F6",
+"OX c #C3C3DD",
+"+X c #C7C0DF",
+"@X c #CAC1DE",
+"#X c #CAC5DD",
+"$X c #CCC3DB",
+"%X c #C9C8DA",
+"&X c #CBC9DD",
+"*X c #C7E5C7",
+"=X c #C5EFC0",
+"-X c #C6EFC1",
+";X c #CAE5C9",
+":X c #CBF1C6",
+">X c #D0F3C9",
+",X c #D1E0FC",
+"<X c None",
+/* pixels */
+"<X<X<X<X;XK.H.I.P.~ ! <X<X<X<X<X",
+"<X<X<XE W.>X^.U.R.=X:XA 5 <X<X<X",
+"<X<XD =X6.B u s 8.K I ).Y.= <X<X",
+"<XT /.Z 9 N.,X.Xt.V.$XL T.5.4 <X",
+";X' ( 0 OXh.oXoXoXh...F.Y { @ <X",
+"G.L., #XA.>. X|.|.|.'.*. .h k e ",
+"F ) q &XC.+.M.m.M.l.M.M.k.@.m ; ",
+"b j 0.%XC.X.f.f.g.g.f.f.4.;.$.r ",
+"n l 9.%XOXd 2.4.1.,.;.#.;.#.g . ",
+"V M P &XC.} p.p.p.p.u.u.O.t z + ",
+"Q ^ c $XC.| B.v.l.l.&.y 3 N v w ",
+"<Xx ` J OX&. X Xg.a p w.S { O <X",
+"<X6 _ [ U | B.a i r.e.G E.: 2 <X",
+"<X<X= / ~.W < H q.E J.!.: X <X<X",
+"<X<X<X4 # 7.(.`._.Q.C O 2 <X<X<X",
+"<X<X<X<X<X8 & - $ + w <X<X<X<X<X"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kaudiocreator.xpm
+++ kdemultimedia-3.5.0/debian/icons/kaudiocreator.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kaudiocreator[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #13151D",
+"X  c #1D033F",
+"o  c #1A1C28",
+"O  c #1E202B",
+"+  c #222535",
+"@  c #390D7C",
+"#  c #292D43",
+"$  c #2E334C",
+"%  c #303450",
+"&  c #353A58",
+"*  c #39415E",
+"=  c #3C4264",
+"-  c #404767",
+";  c #444B72",
+":  c #4A5476",
+">  c #4B527D",
+",  c #011DA9",
+"<  c #002D80",
+"1  c #002A8A",
+"2  c #002694",
+"3  c #00229C",
+"4  c #002D94",
+"5  c #0620A6",
+"6  c #0721BF",
+"7  c #0C28B3",
+"8  c #1622BD",
+"9  c #1E3DAD",
+"0  c #2537BB",
+"q  c #171FC3",
+"w  c #0923C5",
+"e  c #172ADF",
+"r  c #1C20DA",
+"t  c #1C33C9",
+"y  c #1A3BC7",
+"u  c #1B33D1",
+"i  c #1F31D8",
+"p  c #193CD1",
+"a  c #1D27E9",
+"s  c #1B34EC",
+"d  c #2D3DD2",
+"f  c #313CC5",
+"g  c #2429F4",
+"h  c #2139EF",
+"j  c #2335F5",
+"k  c #2136FF",
+"l  c #253BFD",
+"z  c #283CFB",
+"x  c #004B80",
+"c  c #2542BB",
+"v  c #3B5AB3",
+"b  c #2E45C6",
+"n  c #2948CC",
+"m  c #384ED0",
+"M  c #3951C5",
+"N  c #2F51FD",
+"B  c #3C4AFF",
+"V  c #3543FB",
+"C  c #3C57E0",
+"Z  c #5E2C9F",
+"A  c #4F31B6",
+"S  c #5031BA",
+"D  c #4033EF",
+"F  c #4E3DE9",
+"G  c #4A37FF",
+"H  c #493BFF",
+"J  c #5C3BFF",
+"K  c #553BF9",
+"L  c #4E5582",
+"P  c #515A85",
+"I  c #535A8A",
+"U  c #575E92",
+"Y  c #4355BD",
+"T  c #56628E",
+"R  c #576192",
+"E  c #596494",
+"W  c #5B6498",
+"Q  c #5D699A",
+"!  c #7750B2",
+"~  c #636DA5",
+"^  c #646DA8",
+"/  c #6570A7",
+"(  c #6773AB",
+")  c #6874AE",
+"_  c #6978AF",
+"`  c #6D79B4",
+"'  c #6F7DBA",
+"]  c #6A75B2",
+"[  c #7B6FBC",
+"{  c #707CB9",
+"}  c #4D4EDA",
+"|  c #4756C5",
+" . c #4B5FC3",
+".. c #4958CB",
+"X. c #554DC6",
+"o. c #5A4EDC",
+"O. c #5358DF",
+"+. c #5D55D1",
+"@. c #495BE1",
+"#. c #4453FF",
+"$. c #565BE4",
+"%. c #555DED",
+"&. c #5254FF",
+"*. c #535FFF",
+"=. c #4D63C6",
+"-. c #5366C7",
+";. c #556BC5",
+":. c #556DCC",
+">. c #596EC6",
+",. c #5E6DC8",
+"<. c #5967DA",
+"1. c #5E75C6",
+"2. c #5A70CB",
+"3. c #4E60E6",
+"4. c #5F60ED",
+"5. c #5867FE",
+"6. c #5B6CFE",
+"7. c #6851C2",
+"8. c #605FD6",
+"9. c #7A5EC0",
+"0. c #6541FF",
+"q. c #6155FF",
+"w. c #6E51FF",
+"e. c #6063DE",
+"r. c #646FD4",
+"t. c #6964D8",
+"y. c #6F68D4",
+"u. c #6378CD",
+"i. c #6C79CB",
+"p. c #6377D2",
+"a. c #6C66ED",
+"s. c #676DF7",
+"d. c #636DF8",
+"f. c #6371FE",
+"g. c #647DFE",
+"h. c #6A74FE",
+"j. c #6E7BFE",
+"k. c #796CFE",
+"l. c #7674E0",
+"z. c #737BE5",
+"x. c #7976E4",
+"c. c #7273FB",
+"v. c #757BFC",
+"b. c #7982BD",
+"n. c #6E88DC",
+"m. c #7584C3",
+"M. c #7081C9",
+"N. c #7B85C2",
+"B. c #7C8ACB",
+"V. c #7288D1",
+"C. c #7D8ED0",
+"Z. c #7E91D1",
+"A. c #6B82F7",
+"S. c #7785ED",
+"D. c #7482FE",
+"F. c #7888FE",
+"G. c #7A93E5",
+"H. c #8573BF",
+"J. c #8078DA",
+"K. c #8A7DD0",
+"L. c #8572FE",
+"P. c #8188C5",
+"I. c #878DCA",
+"U. c #8780D9",
+"Y. c #8590CD",
+"T. c #8A90CD",
+"R. c #8091D4",
+"E. c #8597DE",
+"W. c #8699DF",
+"Q. c #8C95D0",
+"!. c #9487CB",
+"~. c #9F86C3",
+"^. c #9D85CB",
+"/. c #939AC6",
+"(. c #9491DF",
+"). c #939ED8",
+"_. c #9F97D7",
+"`. c #9E93DD",
+"'. c #8684E3",
+"]. c #8690EA",
+"[. c #8499E3",
+"{. c #889CE3",
+"}. c #8192FE",
+"|. c #9E97E0",
+" X c #9A98E2",
+".X c #9299F5",
+"XX c #9A9FF6",
+"oX c #9BA4DB",
+"OX c #97A8DB",
+"+X c #8CA1E9",
+"@X c #93A2E4",
+"#X c #93A3ED",
+"$X c #91A6F0",
+"%X c #93A9F4",
+"&X c #96ACF8",
+"*X c #9CA4FE",
+"=X c #9BB0F7",
+"-X c #A094DC",
+";X c #A9A6DB",
+":X c #A8ACDF",
+">X c #A3ABE2",
+",X c #ABADE2",
+"<X c #A2ADFE",
+"1X c #A6B1E7",
+"2X c #ABB3E4",
+"3X c #ADB6E9",
+"4X c #AAB8E3",
+"5X c #ABBFEE",
+"6X c #A5B9FD",
+"7X c #ABB9F0",
+"8X c #AFBBFE",
+"9X c #B0BAEB",
+"0X c #B2BDE3",
+"qX c #B9BEF0",
+"wX c #AFC0FC",
+"eX c #B1C1EB",
+"rX c #BDC0E8",
+"tX c #BECAED",
+"yX c #B2C2FA",
+"uX c #B9C0FE",
+"iX c #BBC9F6",
+"pX c #BBCBFA",
+"aX c #BDD2FF",
+"sX c #C3C2EF",
+"dX c #C2CCEE",
+"fX c #C5C9F5",
+"gX c #C1CEFC",
+"hX c #C8CEF4",
+"jX c #CFD1EE",
+"kX c #C4D5FF",
+"lX c #C6D8FF",
+"zX c #CAD4FD",
+"xX c #CBDAFF",
+"cX c #D1D4E8",
+"vX c #D2D9EF",
+"bX c #D8DBEB",
+"nX c #D0D3F1",
+"mX c #D4DBF3",
+"MX c #D1DDFE",
+"NX c #DCDCF4",
+"BX c #D8DAFE",
+"VX c #D6E0F4",
+"CX c #D5E1FF",
+"ZX c #DCE1F5",
+"AX c #DBE4FD",
+"SX c #DEE8FF",
+"DX c #E2E6F5",
+"FX c #E2E6FF",
+"GX c #E5E9F6",
+"HX c #E4EBFE",
+"JX c #E9EBF5",
+"KX c #E9EEFD",
+"LX c #ECF1FE",
+"PX c #F2F5FE",
+"IX c #F6F8FE",
+"UX c #F9FAFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYX< 3 5 3 YXYXR.C.B.B.m.b.~     YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX1 3 0 x...v W.W.@X1X3X3X1X@XY.m.` R     YXYXYXYXYXYXYXYX",
+"YXYXYX3 8 F w.L.z.=.u.mXKXKXKXKXkXzXzXfXoXm.^ =   YXYXYXYXYXYXYX",
+"YXYXYX3 q 0.J H q.c.S.>.ZXLXKXKXxXkXkXxXBXzXQ.) >     YXYXYXYXYX",
+"YXYXYXYX2 8 K G r g #.A.>.KXKXHXxXzXzXCXAXMXFX,X) ;     YXYXYXYX",
+"3 3 3 4 $X[.0 z M.i.a #.C 4XLXHXxXxXxXCXCXKXIXPX2X) &     YXYXYX",
+"7 e.| 9 %XnXNXY 0XUX,.j N :.LXKXCXxXAXAXSXIXIXIXKX;X~     YXYXYX",
+"w k.r.G.uXPXUXUXUXUXmXi z n PXHXCXCXSXSXPXIXIXIXIXFXN.L     YXYX",
+"6 &.<.G.LXKXLXPXUXUXIXn z p IXKXAXSXFXPXIXIXIXIXIXIXfX^ o   YXYX",
+", V s.=.SXtX1.ZXPXUXGXt h y IXKXSXHXKXUXUXUXUXUXIXIXKXI.;     YX",
+"3 e &.@.V.OX<. .VXLXKX;XOX4XPXKXFXKXUXUXUXUXUXIXIXPXIX3XU     YX",
+"* 7 z *.3.M .XXX>.VXLXUXUXLXJXZXZXDXIXUXUXIXIXIXjX,X(.J.J.7.X YX",
+"YXA.b j B 6.6.B D.-.dXLXLXLXJXmXZXJXJXUXNX#X].z..XuXBXuX<XD.@   ",
+"YX%XiX:.u s k k z m Z.KXKXVX{._ b.cXDXJX@X=X8X8X8X=Xj.d.d.f.S   ",
+"YX%XaXlX5Xy j t ;.eXSXSXKXwX:   > /.NXZX@XF.}.}.D.h.d.f.%.o.S   ",
+"YX&XaXlXiXc 1.yXSXLXPXLXLXwX:   E /.ZXSXrXf.$.+.y.U.K._.H.>     ",
+"YX%XlXxXSXKXPXPXPXUXPXPXKXVX+Xm.N.bXDXJXsXd.`.SXAXCXMXxXT.$     ",
+"YX+XaXLXPXPXPXPXUXUXUXUXLXKXZXvXJXJXJXUXNX$. XSXSXSXAXzXb.%     ",
+"YXZ.wXPXPXPXPXUXUXUXUXUXPXSXSXSXDXKXUXUXUX$. XKXSXSXAXzX^       ",
+"YX  &XLXPXPXUXPXPXUXUXUXKXHXKXLXIXUXUXUXUX}  XPXLXKXSX>XI       ",
+"YX  +XkXUXUXUXUXUXUXUXLXSXAXKXLXPXIXUXUXUX+.-XIXLXKXBXP.=     YX",
+"YXYXE =XLXLXPXUXPXUXPXSXSXCXLXLXtXC.:X;X!.t.-XUXIXPXqX~       YX",
+"YXYX  {.iXUXUXPXPXPXSXCXCXxXKXeXp.BXBXBXBXl.-XUXUXFXP.=       YX",
+"YXYXYXT +XxXPXPXUXHXCXCXlXlXHXp.*X*X*X*X}.g.`.IXIX).Q       YXYX",
+"YXYXYX  / #XAXIXLXCXCXCXaXxXKXi.s.h.f.6.6.%.^.LX,X^ o       YXYX",
+"YXYXYXYX  Q +XzXAXzXxXlXaXxXHXdXX.c.v.v.a.Z NX>X) #       YXYXYX",
+"YXYXYXYX    E {.5XAXCXaXaXxXHXHXnXH.9.! ~.sXT./ +         YXYXYX",
+"YXYXYXYXYX    $ m.#X9XzXxXxXSXHXKXSXFXhX).' I           YXYXYXYX",
+"YXYXYXYXYXYX      * _ Z.@X>X9X3X3XOXB.` P o           YXYXYXYXYX",
+"YXYXYXYXYXYXYXYX        $ ; W Q R = o             YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX                            YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX                YXYXYXYXYXYXYXYXYXYXYXYX"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kaboodle-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/kaboodle-16.xpm
@@ -0,0 +1,180 @@
+/* XPM */
+static char *kaboodle-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 158 2",
+"   c black",
+".  c #010102",
+"X  c #010103",
+"o  c #020203",
+"O  c #040406",
+"+  c #06060B",
+"@  c #07080B",
+"#  c #09090F",
+"$  c #090910",
+"%  c #15151F",
+"&  c #141426",
+"*  c #17172A",
+"=  c #181827",
+"-  c #1E1F2D",
+";  c #1E1F2F",
+":  c #292944",
+">  c #2D2E53",
+",  c #2F2F54",
+"<  c #36365A",
+"1  c #383856",
+"2  c #3C3C54",
+"3  c #393963",
+"4  c #3C3E63",
+"5  c #3F3F66",
+"6  c #3E3F74",
+"7  c #3F406B",
+"8  c #4A4A5F",
+"9  c #46476E",
+"0  c #47476F",
+"q  c #494A7F",
+"w  c #4E5071",
+"e  c #52526C",
+"r  c #4F4F8C",
+"t  c #52548D",
+"y  c #5B5B84",
+"u  c #585994",
+"i  c #5E5E91",
+"p  c #626286",
+"a  c #63648B",
+"s  c #6F6F8B",
+"d  c #606094",
+"f  c #737499",
+"g  c #74749C",
+"h  c #6769A0",
+"j  c #676AA3",
+"k  c #6769AA",
+"l  c #6868A7",
+"z  c #6B6CA1",
+"x  c #6C6FAB",
+"c  c #6F6FAB",
+"v  c #6D70AC",
+"b  c #7273A3",
+"n  c #7375A6",
+"m  c #7171AC",
+"M  c #7171AD",
+"N  c #7475A9",
+"B  c #7579AB",
+"V  c #7779A9",
+"C  c #7779AB",
+"Z  c #7377B7",
+"A  c #7477B6",
+"S  c #7579B4",
+"D  c #7579B7",
+"F  c #7579B9",
+"G  c #7779B8",
+"H  c #787CB8",
+"J  c #7B7EBA",
+"K  c #7C7DB8",
+"L  c #8384BB",
+"P  c #8E8EB4",
+"I  c #8C8DBD",
+"U  c #8185C3",
+"Y  c #878BC4",
+"T  c #858AC9",
+"R  c #868ACB",
+"E  c #8A90CF",
+"W  c #8C91CF",
+"Q  c #9697C3",
+"!  c #9698C3",
+"~  c #9B9BC5",
+"^  c #9C9CCA",
+"/  c #9C9ECA",
+"(  c #9C9FCA",
+")  c #9D9ECC",
+"_  c #9299D6",
+"`  c #959BD7",
+"'  c #9CA2D7",
+"]  c #9DA2D8",
+"[  c #A4A4C4",
+"{  c #A0A2C9",
+"}  c #A1A1CD",
+"|  c #A2A3CD",
+" . c #A5A7CE",
+".. c #A6A6CF",
+"X. c #A1A3D1",
+"o. c #A7AAD4",
+"O. c #A4A8D8",
+"+. c #A4A9DB",
+"@. c #A9AAD1",
+"#. c #ACAED5",
+"$. c #AFB0D5",
+"%. c #B5B5D6",
+"&. c #B2B4DC",
+"*. c #B3B6DD",
+"=. c #B8B9DB",
+"-. c #B9BBDE",
+";. c #BEBEDB",
+":. c #A7AFE7",
+">. c #A9B0E4",
+",. c #ACB2E4",
+"<. c #AFB4E3",
+"1. c #AFB6E7",
+"2. c #B2B8E6",
+"3. c #B5B9E2",
+"4. c #B0B8EE",
+"5. c #B3BBEE",
+"6. c #B8BDE7",
+"7. c #B3BCF2",
+"8. c #B7C0F5",
+"9. c #B9C3F5",
+"0. c #B8C2F6",
+"q. c #B9C3F7",
+"w. c #BEC8FB",
+"e. c #C0C0DC",
+"r. c #C1C2DD",
+"t. c #C1C2DF",
+"y. c #C3C3DC",
+"u. c #C7C7E3",
+"i. c #C0C5EA",
+"p. c #C3C7E9",
+"a. c #C0C5ED",
+"s. c #C9C9E1",
+"d. c #CBCCE8",
+"f. c #CBCEEC",
+"g. c #CCCFE9",
+"h. c #C4CBF6",
+"j. c #C2CBFB",
+"k. c #C1CCFD",
+"l. c #C3CEFF",
+"z. c #C7D1FF",
+"x. c #CAD2F9",
+"c. c #CCD5FF",
+"v. c #CDD6FF",
+"b. c #D2DAFF",
+"n. c #D2DBFF",
+"m. c #D7DEFF",
+"M. c #D8DFFE",
+"N. c #D8DFFF",
+"B. c #DFE3FC",
+"V. c #DDE4FF",
+"C. c #DFE5FF",
+"Z. c #E2E3F3",
+"A. c #E2E4F6",
+"S. c #E0E3F9",
+"D. c #E1E6FD",
+"F. c #E4E8FE",
+"G. c #EAEEFF",
+"H. c None",
+/* pixels */
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.",
+"H.H.H.H.H.g ! #.;.t.$.! b 1 H.H.",
+"<.} ..} ^ ~ e.s.y.e.g.f.o.z = H.",
+"@.u.Z.d./ %.[ s 8 e g ( i.O.h < ",
+"=.A.G.C.*.P 2       O 0 C 2.] c ",
+"-.F.C.m.6.p   H.H.H.H.  4 Y 5.S ",
+"&.V.b.c.2.a   c d i 5   @ F 4.E ",
+"X.h.l.k.' w ; m {  .N : $ S 8.E ",
+"I O.q.>.V & 0 ^ S.C.3.u t _ 7.x ",
+"C L n y -   m p.V.m.x.D U :.D , ",
+"H.          K i.b.c.j.R Y l , + ",
+"H.H.        k ,.z.l.q.k 3 *     ",
+"H.H.H.H.H.  7 J q.w.` 6 o   H.H.",
+"H.H.H.      $ q Z F t &   H.H.H.",
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.",
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/noatun.xpm
+++ kdemultimedia-3.5.0/debian/icons/noatun.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *noatun[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #000A00",
+"X  c #001400",
+"o  c #001800",
+"O  c #0F1218",
+"+  c #03091C",
+"@  c #1D1C21",
+"#  c #003B00",
+"$  c #003100",
+"%  c #1B2D1E",
+"&  c #092C34",
+"*  c #3D3A3E",
+"=  c #0A1D4E",
+"-  c #223D55",
+";  c #3F3B40",
+":  c #353F5B",
+">  c #2E3C66",
+",  c #323D60",
+"<  c #004500",
+"1  c #004B00",
+"2  c #045C00",
+"3  c #04510B",
+"4  c #1B561B",
+"5  c #086002",
+"6  c #197814",
+"7  c #1E6718",
+"8  c #214923",
+"9  c #354A39",
+"0  c #217B1C",
+"q  c #29682A",
+"w  c #346D35",
+"e  c #0E5A46",
+"r  c #1E4C75",
+"t  c #144675",
+"y  c #1A5C6F",
+"u  c #177947",
+"i  c #3C4156",
+"p  c #3B5444",
+"a  c #344445",
+"s  c #403C3F",
+"d  c #403C40",
+"f  c #585459",
+"g  c #5A5A5A",
+"h  c #546B5B",
+"j  c #576D57",
+"k  c #5F6065",
+"l  c #64656B",
+"z  c #66696C",
+"x  c #686568",
+"c  c #696671",
+"v  c #667C6E",
+"b  c #697E72",
+"n  c #76747A",
+"m  c #284797",
+"M  c #2A4DA3",
+"N  c #2D52AC",
+"B  c #3258B7",
+"V  c #25689C",
+"C  c #2F69AE",
+"Z  c #3161A7",
+"A  c #2E5BC9",
+"S  c #305DD8",
+"D  c #325AC8",
+"F  c #3665D5",
+"G  c #3B69D5",
+"H  c #767081",
+"J  c #446DCE",
+"K  c #446ED5",
+"L  c #456CD7",
+"P  c #4A76D9",
+"I  c #4B76D7",
+"U  c #5A77C6",
+"Y  c #527CDA",
+"T  c #5B7ED9",
+"R  c #5179D4",
+"E  c #517DE0",
+"W  c #617BC4",
+"Q  c #099901",
+"!  c #14850D",
+"~  c #1E8319",
+"^  c #198513",
+"/  c #119A08",
+"(  c #1B9713",
+")  c #1C9816",
+"_  c #0C8505",
+"`  c #169134",
+"'  c #12AD02",
+"]  c #14A608",
+"[  c #1FA815",
+"{  c #19B109",
+"}  c #239C1B",
+"|  c #258818",
+" . c #268822",
+".. c #299823",
+"X. c #32982B",
+"o. c #3F9F31",
+"O. c #3B8737",
+"+. c #25AA1A",
+"@. c #28B31A",
+"#. c #29A221",
+"$. c #2AAA20",
+"%. c #2FB422",
+"&. c #32A22B",
+"*. c #38AD2E",
+"=. c #36A232",
+"-. c #38A333",
+";. c #3BAD32",
+":. c #34B529",
+">. c #3FB038",
+",. c #218447",
+"<. c #42893E",
+"1. c #45B43E",
+"2. c #49BB3F",
+"3. c #458149",
+"4. c #56925B",
+"5. c #4AAD44",
+"6. c #43A741",
+"7. c #4BB343",
+"8. c #4EB049",
+"9. c #4CBA43",
+"0. c #50AF4B",
+"q. c #50B44A",
+"w. c #52BA4A",
+"e. c #5BBD53",
+"r. c #5FB45A",
+"t. c #658E6C",
+"y. c #61B75A",
+"u. c #69AA6F",
+"i. c #68BA63",
+"p. c #70AE77",
+"a. c #6BA972",
+"s. c #44C036",
+"d. c #4EC342",
+"f. c #54C14A",
+"g. c #58C54D",
+"h. c #5CC353",
+"j. c #5EC954",
+"k. c #63C75B",
+"l. c #6AC463",
+"z. c #6ECC65",
+"x. c #67C261",
+"c. c #71C36B",
+"v. c #70CD67",
+"b. c #73CB6D",
+"n. c #7CCD75",
+"m. c #7EC073",
+"M. c #7CD073",
+"N. c #5C83DB",
+"B. c #5B8DE4",
+"V. c #5A85E2",
+"C. c #5F96EA",
+"Z. c #6880C4",
+"A. c #6488DC",
+"S. c #6D91DF",
+"D. c #7689C6",
+"F. c #7191DF",
+"G. c #6A8BE4",
+"H. c #6287E4",
+"J. c #6492E5",
+"K. c #6498EA",
+"L. c #6B9CEB",
+"P. c #6C95E5",
+"I. c #7194E3",
+"U. c #739BE7",
+"Y. c #729FEB",
+"T. c #6BA0EE",
+"R. c #73A4EE",
+"E. c #7AA4EA",
+"W. c #7BAAEE",
+"Q. c #79A1E7",
+"!. c #75A6F0",
+"~. c #7CABF0",
+"^. c #82CC7C",
+"/. c #86D37E",
+"(. c #80D477",
+"). c #858385",
+"_. c #858092",
+"`. c #888090",
+"'. c #82AF80",
+"]. c #87B292",
+"[. c #86B185",
+"{. c #9DA8A6",
+"}. c #9EB7AC",
+"|. c #A8A3B8",
+" X c #AEADBD",
+".X c #859FE8",
+"XX c #82A5E9",
+"oX c #83ABEC",
+"OX c #8CADEB",
+"+X c #82A2E6",
+"@X c #83AEF0",
+"#X c #8AB0EE",
+"$X c #86B1F0",
+"%X c #8BB4F1",
+"&X c #91A9EB",
+"*X c #93B4ED",
+"=X c #9CB8ED",
+"-X c #9AB4EC",
+";X c #90B7F2",
+":X c #95BBF2",
+">X c #9BBCF1",
+",X c #AFB4D3",
+"<X c #B5ADC5",
+"1X c #B3B6CD",
+"2X c #BCB8CD",
+"3X c #B3B2C3",
+"4X c #B0B5D3",
+"5X c #A2BBEE",
+"6X c #A7BDF0",
+"7X c #8EC69E",
+"8X c #89D482",
+"9X c #89D584",
+"0X c #91D689",
+"qX c #92D98B",
+"wX c #9BDB94",
+"eX c #9EDD98",
+"rX c #A2DD9B",
+"tX c #A3D6A1",
+"yX c #A3E09D",
+"uX c #A6E0A0",
+"iX c #A9E1A4",
+"pX c #AEE2A8",
+"aX c #B1E4AC",
+"sX c #B5E4B1",
+"dX c #B9E6B5",
+"fX c #BCE6B8",
+"gX c #BCE8B9",
+"hX c #9EC0F3",
+"jX c #AFD4C4",
+"kX c #BAC0CC",
+"lX c #A6C0EF",
+"zX c #A2C1F2",
+"xX c #AAC6F3",
+"cX c #AAC8F5",
+"vX c #B0C6F1",
+"bX c #B3CDF5",
+"nX c #BACEF3",
+"mX c #BBD2F6",
+"MX c #C0BECF",
+"NX c #C0BDD1",
+"BX c #C2E9BE",
+"VX c #C5C4D6",
+"CX c #C6C5D8",
+"ZX c #C8C7D6",
+"AX c #C9C4DA",
+"SX c #C9C8DB",
+"DX c #C9C8D7",
+"FX c #CEC8E2",
+"GX c #CEC7E1",
+"HX c #C2D4F5",
+"JX c #CAD8F4",
+"KX c #C5EBC1",
+"LX c #C8ECC4",
+"PX c #CEEDCB",
+"IX c #C4E2C3",
+"UX c #D0EECD",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXrXr.0.y.c.i.0.<.'.YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXIX5.&.^.fXUXUXUXUXUXfX^.&.2 j YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX6.1.dXPXPXIXLXLXPXLXPXLXLXPXdXq.< l YXYXYXYXYXYXYX",
+"YXYXYXYXYXjX) rXBXBXBXPXpX^.y.l.k.n.tXLXBXBXLXyX! % YXYXYXYXYXYX",
+"YXYXYXYX7X..gXgXgXfXk.u e p k l l h q  .k.gXfXfXfX=.o YXYXYXYXYX",
+"YXYXYXjX+.fXsXfX8X6 r &X5XG.U 1XSXAXMX|.v  .^.dXaXdX=.. YXYXYXYX",
+"YXYXYX) aXaXaXk.4 c T JXJXJXmXA.U 1XDXZXAX<X3.e.aXpXaX^ @ YXYXYX",
+"YXYX6.9XtXtXe.8 `.4XF.HXHXHXHXHXvXT W 2XAXAXVXt.e.iXtX9X< l YXYX",
+"YXIX;.rXeXM.4 _.VX,XI.bXmXmXmXmXnXmX5XR Z.MXZXVX4.v.yXyX1.  YXYX",
+"YX5.8XwXqX^ c VXVX,XF.xXbXbXbXbXbXvXvXxXOXJ D.VXAX..:.k.v.1 f YX",
+"YX} qXqXw.9 3XCXVX,XA.5XcXcXcXcXcXxXcXxXlX5XXXJ D.{.Q ' ' Q   YX",
+"tXw./.8X~ H CXVXVX,XA.=XzXhXhXhXzXhXhXhXzX5X-X-XI.L u ' { ] X YX",
+"y.c.M.z.4  XCXVXVX,XN.*X*X:X:X:X:X:X:XhXhX;X:X;X*XOXG.C ` ' # ).",
+"5.h.z.d.p 2XVXVXVX4XY oX%X;X;X;X;X;X;X;X;X;X;X;X%XOXOXXXT Z 3 * ",
+"5.{ { Q l CXVXVXVX4XY XX#X%X%X%X%X%X$X%X%X%X%X%X%X#X$XW.E.I.D O ",
+"8.[ @./ c CXVXVXVX4XI E.oX%X$X$X$X$X$X$X$X$X$XoXR.T.K.C.B.P F = ",
+"8.@.%.] c DXVXVXCX4XF J.R.~.@X@X$X$X$X~.~.R.T.T.T.L.L.K.H.Y S + ",
+"5.%.:.[ h AXVXVXVX4XG J.T.!.!.!.!.!.R.!.R.R.!.R.R.L.K.J.Y A &   ",
+"<.:.2.%.w kXVXVXVX4XL U.W.~.~.~.~.~.~.~.~.~.W.!.Y.U.V.F r 7 $ d ",
+"[.$.d.d.~ |.VXVXCX4XP Y.oX@X$X@X$X$X$X$X@XoXE.Y.I.G r q -.%.o `.",
+"YX/ g.h.+.b SXVXVX,XI oX%X%X%X;X%X%X%X#XoXoXP.K m a | g.g.)   YX",
+"YX2 f.k.h.~ <XAXVX,XY OX:X:X>X:X:X:X*XOXXXY m f `.X.g.k.f.1   YX",
+"YXj +.z.v.2.3.AXZX4XY *X>XhX>X>X:X*XOXN.M : n 2Xp.1.v.z.$.  g YX",
+"YXYX< h.M.M.*.t.AX4XY =X6XzX6X5X*XJ.N : n 3XFX].*.M.M.k.<   YXYX",
+"YXYXl _ n.8X/.>.4.AXK 5X5X5X6XI.B : z 3XSXGXa.;././.(.!   z YXYX",
+"YXYXYX% } 9XqXqXh.X.Z .X=XI.B > x  XGXFX}.-.e.qXqX8X} . @ YXYXYX",
+"YXYXYXYXo +.0XeXeXqX0.y t - g {.2X}.a.-.7.0XrXeX0X} .   YXYXYXYX",
+"YXYXYXYXYX. ! M.uXiXtXwXm.y.w.1.7.e.^.rXyXuXyXM.! .   YXYXYXYXYX",
+"YXYXYXYXYXYX@ < >.qXpXaXaXpXaXaXpXpXaXaXaX0X1.<   @ YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXl   1 &.l.wXaXaXsXaXaXwXz.&.1     z YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXf   X # 2 6 0 6 5 # o     g YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX).; ; ; ; ; ; ).YXYXYXYXYXYXYXYXYXYXYXYX"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kscd-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/kscd-16.xpm
@@ -0,0 +1,253 @@
+/* XPM */
+static char *kscd-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 231 2",
+"   c black",
+".  c #010306",
+"X  c #020912",
+"o  c #1F1D19",
+"O  c #05133C",
+"+  c #202023",
+"@  c #091846",
+"#  c #081948",
+"$  c #0B1F58",
+"%  c #132D71",
+"&  c #152F72",
+"*  c #182F70",
+"=  c #183072",
+"-  c #193172",
+";  c #1A3172",
+":  c #1D3374",
+">  c #1F3677",
+",  c #242D49",
+"<  c #28365E",
+"1  c #2D3A63",
+"2  c #2E3C62",
+"3  c #2F3C62",
+"4  c #2F3C63",
+"5  c #2F3C64",
+"6  c #213572",
+"7  c #303D64",
+"8  c #2E4EAC",
+"9  c #3B70DA",
+"0  c #546BAB",
+"q  c #6C7F9A",
+"w  c #436BD1",
+"e  c #4F74D3",
+"r  c #5176D3",
+"t  c #597DD5",
+"y  c #5A7DD4",
+"u  c #5B7DD5",
+"i  c #4B7DE1",
+"p  c #5C8DDB",
+"a  c #5885E2",
+"s  c #6980C2",
+"d  c #6586D8",
+"f  c #628BDD",
+"g  c #6A8AD9",
+"h  c #728FDB",
+"j  c #7D97DF",
+"k  c #7E99DD",
+"l  c #6284E4",
+"z  c #6092EE",
+"x  c #6B97E6",
+"c  c #6999E2",
+"v  c #6E9CE7",
+"b  c #6B9BEA",
+"n  c #729CE7",
+"m  c #749CE3",
+"M  c #759FE6",
+"N  c #769EE7",
+"B  c #769EE8",
+"V  c #7895E4",
+"C  c #7A9DE1",
+"Z  c #7B9CE6",
+"A  c #7C9FE1",
+"S  c #7B9FE8",
+"D  c #7D9EE8",
+"F  c #60A4EF",
+"G  c #6FB3F1",
+"H  c #75A0E1",
+"J  c #76A2EB",
+"K  c #75A5EA",
+"L  c #76A6EE",
+"P  c #70ACEE",
+"I  c #79A1E1",
+"U  c #7BA2E7",
+"Y  c #79A2EF",
+"T  c #7FA0E8",
+"R  c #7FA6E9",
+"E  c #7DAAEE",
+"W  c #7EA9ED",
+"Q  c #78B4ED",
+"!  c #77B4F1",
+"~  c #7EB9F3",
+"^  c #7EBAF3",
+"/  c #889FDF",
+"(  c #8DA4C7",
+")  c #8AA4DD",
+"_  c #81A0E7",
+"`  c #80A3E4",
+"'  c #82A1E6",
+"]  c #81A6E5",
+"[  c #82A2E8",
+"{  c #85A4EA",
+"}  c #87A7EB",
+"|  c #87A6EC",
+" . c #80AAEB",
+".. c #82A9EA",
+"X. c #83AFEB",
+"o. c #84AAEA",
+"O. c #87AFEC",
+"+. c #88A7EC",
+"@. c #89A8E7",
+"#. c #89ABE7",
+"$. c #8BABE6",
+"%. c #8DA9E5",
+"&. c #8CA9E6",
+"*. c #89A8EC",
+"=. c #89A8ED",
+"-. c #8DADEA",
+";. c #8FB6ED",
+":. c #82B1F1",
+">. c #80B5F2",
+",. c #84B0F0",
+"<. c #86B1F1",
+"1. c #82BAF3",
+"2. c #8BB4F0",
+"3. c #8FB6F0",
+"4. c #88BAF4",
+"5. c #8CBBF3",
+"6. c #90AFE7",
+"7. c #90AFE9",
+"8. c #90AFEE",
+"9. c #95ADED",
+"0. c #90B1EB",
+"q. c #90B1ED",
+"w. c #90B2ED",
+"e. c #92B1ED",
+"r. c #92B1EE",
+"t. c #91B4E9",
+"y. c #90B6ED",
+"u. c #96B0E9",
+"i. c #94B9ED",
+"p. c #95B8EE",
+"a. c #9FB4E7",
+"s. c #99B4EB",
+"d. c #9FB7E9",
+"f. c #9FB8E8",
+"g. c #9FBAEA",
+"h. c #9FBBEE",
+"j. c #9DBCEA",
+"k. c #9DBDEE",
+"l. c #93B9F3",
+"z. c #92BAF2",
+"x. c #94B9F0",
+"c. c #97B9F0",
+"v. c #96BCF2",
+"b. c #96BEF3",
+"n. c #96BDF5",
+"m. c #98BCF3",
+"M. c #98BDF3",
+"N. c #ACBEDA",
+"B. c #A2BFEC",
+"V. c #A4BCED",
+"C. c #A1BFF0",
+"Z. c #8FC0F4",
+"A. c #93C1F4",
+"S. c #9FC0F1",
+"D. c #9EC0F4",
+"F. c #B3C4DA",
+"G. c #AFC3E7",
+"H. c #ABC0EB",
+"J. c #A9C0ED",
+"K. c #ACC2EB",
+"L. c #ACC1EE",
+"P. c #AEC3EE",
+"I. c #A2C1F2",
+"U. c #A3C2F3",
+"Y. c #A4C2F0",
+"T. c #A2C0F9",
+"R. c #A8C2F0",
+"E. c #ABC2F2",
+"W. c #ABC5F3",
+"Q. c #ADC5F0",
+"!. c #ACC7F3",
+"~. c #AEC6F2",
+"^. c #AFC9F4",
+"/. c #B4C9EF",
+"(. c #BBCEE9",
+"). c #BACDEF",
+"_. c #B0CAF0",
+"`. c #B1CBF2",
+"'. c #B1CCF4",
+"]. c #B2CCF6",
+"[. c #B4CCF6",
+"{. c #B4CEF5",
+"}. c #B9CFF2",
+"|. c #BACDF0",
+" X c #BACDF1",
+".X c #BBCFF0",
+"XX c #BAD0F3",
+"oX c #BDD3F3",
+"OX c #BCD2F5",
+"+X c #BDD2F4",
+"@X c #BFD4F1",
+"#X c #C0CCE0",
+"$X c #C3D2E8",
+"%X c #C6D5EA",
+"&X c #CFDAEB",
+"*X c #CFDBEA",
+"=X c #CFDBEE",
+"-X c #C0D3F4",
+";X c #C4D4F3",
+":X c #C5D7F3",
+">X c #C6D7F3",
+",X c #C7D7F4",
+"<X c #C7D8F4",
+"1X c #CAD7F4",
+"2X c #CADAF1",
+"3X c #CADBF3",
+"4X c #C9D8F6",
+"5X c #C9DAF6",
+"6X c #CBDCF5",
+"7X c #CBDDF7",
+"8X c #CFDDF3",
+"9X c #CFDEF6",
+"0X c #D0D9E7",
+"qX c #D1DDEF",
+"wX c #D2DDF0",
+"eX c #D0DEF6",
+"rX c #D0DFF6",
+"tX c #D1DFF6",
+"yX c #CEE0F7",
+"uX c #D2E0F6",
+"iX c #D4E0F6",
+"pX c #D3E1FB",
+"aX c #DCE8FB",
+"sX c #DCE9FA",
+"dX c #DCEAFB",
+"fX c #DEE9F9",
+"gX c #E0E2E4",
+"hX c #E1ECFC",
+"jX c #E3EEFC",
+"kX c #E4EFFD",
+"lX c None",
+/* pixels */
+"lXlXlXlXlX8X(.$X%XF.(.gXlXlXlXlX",
+"# s 0 $ ( 0X*X*X=XqXwXN.X lXlXlX",
+"j 1X4XpXa.) G.2X2X6X6XrX-X. lXlX",
+"/  X-X>X>X;XV.&.9.s.q.q.T.q lXlX",
+"k ~.}.oXoXoX XK.V.E.P.~.V.' > lX",
+"h h.`.`.'.].B.U.Y.B.E.'.~.J.9.@ ",
+"d q.j.k.S.D.i.M.M.M.S.].].!.&.6 ",
+"t R t.i.v.M.3.2.2.P Q 5.b.x.f : ",
+"r B O.;.l.b.l.J z F G ! ~ c 9 % ",
+"r n W ;.o.W K ,.,.~ ~ 1.2.p i & ",
+"w x L v  XtX).m d.X.A.A.H b a & ",
+"t B W M tXkXpX] sXtXg.I ..J U ; ",
+"g &.sX$.9XjX9XA sXjX/.U 5XJ.r.; ",
+"t @.0.] ,XdX,XC .X6.q.x.7.-.' * ",
+"8 V { { D ' D ' D *.*.| | ' l O ",
+"+ < 7 7 7 1 5 7 7 1 5 5 5 1 , o "
+};
--- kdemultimedia-3.5.0.orig/debian/icons/krec-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/krec-16.xpm
@@ -0,0 +1,94 @@
+/* XPM */
+static char *krec-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 72 1",
+"  c black",
+". c gray5",
+"X c #0E0E0E",
+"o c gray6",
+"O c #190C07",
+"+ c #1F110B",
+"@ c gray7",
+"# c gray8",
+"$ c #151515",
+"% c gray9",
+"& c #1B1B1B",
+"* c #1D1D1D",
+"= c gray12",
+"- c #20120D",
+"; c #21120D",
+": c #211715",
+"> c #271711",
+", c #281812",
+"< c #2A1912",
+"1 c #2B1913",
+"2 c #2F1C14",
+"3 c #391A0F",
+"4 c #311B13",
+"5 c #311D16",
+"6 c #2F211C",
+"7 c #362017",
+"8 c #392016",
+"9 c #3B231A",
+"0 c #202020",
+"q c gray13",
+"w c #252525",
+"e c gray15",
+"r c #282828",
+"t c gray16",
+"y c #2A2A2A",
+"u c gray17",
+"i c #2C2C2C",
+"p c gray18",
+"a c #2F2F2F",
+"s c #352823",
+"d c #382A25",
+"f c #313131",
+"g c #323232",
+"h c #3F3F3F",
+"j c #432115",
+"k c #42251B",
+"l c #47281C",
+"z c #47291D",
+"x c #4E2A1C",
+"c c #573426",
+"v c #523429",
+"b c #5D3728",
+"n c #5D3729",
+"m c #633525",
+"M c #673B2B",
+"N c #6E402F",
+"B c #724332",
+"V c #784532",
+"C c #7B4936",
+"Z c #7C4A37",
+"A c #454141",
+"S c #636161",
+"D c DimGray",
+"F c #6F6B6A",
+"G c #7C7C7C",
+"H c #8D543E",
+"J c #817E7C",
+"K c #9C9B9B",
+"L c #A0A0A0",
+"P c #AEADAD",
+"I c gray72",
+"U c None",
+/* pixels */
+"UUUUUpy=$UUUUUUU",
+"UUUUUpy*@XUUUUUU",
+"UUUUUpw&XXXUUUUU",
+"UUUUUy=&XX.UUUUU",
+"UUUUgy*$..XUUUUU",
+"UUUUgy*@..XUUUUU",
+"UUUUpw&XXXXUUUUU",
+"UUUUkv6XAKIUUUUU",
+"UUUHZb4<KIIUUUUU",
+"UUUmNb9<AIIUUUUU",
+"UUUVBc52&JIIUUUU",
+"UUUZMl5;sFPIUUUU",
+"UUUxj52;dSDIUUUU",
+"UUU3z2;;,UGIIUUU",
+"UUUUUO>,UUUUUUUU",
+"UUUUUUUUUUUUUUUU"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kmix.xpm
+++ kdemultimedia-3.5.0/debian/icons/kmix.xpm
@@ -0,0 +1,117 @@
+/* XPM */
+static char *kmix[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 79 1",
+"  c #000000",
+". c #00000B",
+"X c #000014",
+"o c #00001A",
+"O c #001B16",
+"+ c #000021",
+"@ c #00002B",
+"# c #000030",
+"$ c #1D1D31",
+"% c #00350D",
+"& c #003C0F",
+"* c #003310",
+"= c #003B11",
+"- c #252525",
+"; c #2C2C2C",
+": c #353535",
+"> c #3B3B3B",
+", c #373745",
+"< c #00460C",
+"1 c #004A0D",
+"2 c #005402",
+"3 c #005D02",
+"4 c #005B09",
+"5 c #005011",
+"6 c #006302",
+"7 c #006C01",
+"8 c #007401",
+"9 c #007108",
+"0 c #007B02",
+"q c #007808",
+"w c gray27",
+"e c #4B4B4B",
+"r c #4F4F56",
+"t c #515151",
+"y c #52525A",
+"u c #5C5C5D",
+"i c #5F5F61",
+"p c #626262",
+"a c #606068",
+"s c #6A6A6A",
+"d c #6F6F72",
+"f c #737373",
+"g c #767678",
+"h c #7B7B7B",
+"j c #008301",
+"k c #008108",
+"l c #008B00",
+"z c #009302",
+"x c #009A00",
+"c c #00A300",
+"v c #00AA00",
+"b c #00B400",
+"n c #00BC00",
+"m c #00C300",
+"M c #00CC00",
+"N c #00D400",
+"B c #00DB00",
+"V c #00E300",
+"C c #00EA00",
+"Z c #00F400",
+"A c #00FB00",
+"S c #828282",
+"D c #8B8B8B",
+"F c #939393",
+"G c #9B9B9B",
+"H c #A3A3A3",
+"J c #ABABAB",
+"K c #B3B3B3",
+"L c #B4B4BA",
+"P c #BBBBBB",
+"I c #C2C2C2",
+"U c #C6C6C8",
+"Y c #CBCBCB",
+"T c #D4D4D4",
+"R c #DBDBDB",
+"E c gray89",
+"W c #EEEEEE",
+"Q c gray100",
+"! c None",
+/* pixels */
+"!!!!!!!!!mMNBVCZAACVBMm!!!!!!!!!",
+"!!!!!!!bnmMNBNBNBBNNNMmbvz!!!!!!",
+"!!!!!cvbmnbxq%.X...68xvbbcj@!!!!",
+"!!!!ccvcq*X            2lxxk@!!!",
+"!!!xxx9X    !!!!!!!!!!!! 3jzq@!!",
+"!!lzl*.   !!!!!!!!!!!!!!!! 8j6o!",
+"!!ljO   !!!!!!!!!!!!!!!!!!!!88o ",
+"!!l=.  !!!!!!!!!!!!!!!!!!!!!38< ",
+"!!0X  !!!!!!NBCZAZCBN!!!!!!!!8< ",
+"!!6. !!!!bmMNBCZAACNMmbz!!!!!62 ",
+"!!#  !!cvbnnvzq9763cvvbcz#!!!!X ",
+"!!! !!xcvx1X          8zxj5!!!! ",
+"!!!!!zxz=X   !!!!!!!!!! 7lqo!!!!",
+"!!!!!l0o   !!!!!!!!!!!!!!201o!!!",
+"!!!!ljO   !!!PPPIUU!!!!!!!76o !!",
+"!!!!l4  KJHFDFGHHJJKPPYL!!!7X !!",
+"!!!!0XhGhhhsppppsfhDGJPPIL!7. !!",
+"!!!!!FfgsppppppsdhhDDGHJPIP@  !!",
+"!!!!FfsppppppppdghDDGHJKKIIP@!!!",
+"!!!GssppppppppsfhDDFGJJKIUYIHo!!",
+"!!!hfpppppppDITWWRUKHJKIUTTYUo !",
+"!!!pfpppppfJIUPKJPRYPKPIYTRYYo !",
+"!!!pfpppppFfSFDhgghGHGIYTRETIo !",
+"!!!efppppspttttttttuspKYRREYJo !",
+"!!!>sfpppit:::::::>w>eIRRETIio !",
+"!!!w-shspsuw>::::>>>eGTRERUgo  !",
+"!!!!>-eSSggfpwwwweefJRERTHd$  !!",
+"!!!!!;:-tSFGHHGHJJURRRIGfiX   !!",
+"!!!!!! ->::tsSFGGHFFSsay$.   !!!",
+"!!!!!!!! ->tw>>weysSfpo    !!!!!",
+"!!!!!!!!!!>wewwwtpfsp,. !!!!!!!!",
+"!!!!!!!!!!!-wtyuppitX   !!!!!!!!"
+};
--- kdemultimedia-3.5.0.orig/debian/icons/kmid-16.xpm
+++ kdemultimedia-3.5.0/debian/icons/kmid-16.xpm
@@ -0,0 +1,126 @@
+/* XPM */
+static char *kmid-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 104 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #040404",
+"+  c gray2",
+"@  c gray4",
+"#  c #0C0C0C",
+"$  c #101010",
+"%  c #111111",
+"&  c gray7",
+"*  c #161616",
+"=  c gray9",
+"-  c gray10",
+";  c gray11",
+":  c #1D1D1D",
+">  c #1E1E1E",
+",  c gray12",
+"<  c #222222",
+"1  c #232323",
+"2  c gray14",
+"3  c #252525",
+"4  c gray15",
+"5  c #282828",
+"6  c #2A2A2A",
+"7  c gray17",
+"8  c #2D2D2D",
+"9  c gray18",
+"0  c #2F2F2F",
+"q  c gray19",
+"w  c gray20",
+"e  c #393939",
+"r  c #3A3A3A",
+"t  c gray24",
+"y  c #3F3F3F",
+"u  c gray25",
+"i  c gray26",
+"p  c #444444",
+"a  c #464646",
+"s  c #494949",
+"d  c gray29",
+"f  c #4B4B4B",
+"g  c #505050",
+"h  c #555555",
+"j  c #565656",
+"k  c gray34",
+"l  c #585858",
+"z  c gray35",
+"x  c #5B5B5B",
+"c  c #626262",
+"v  c gray39",
+"b  c gray40",
+"n  c #686868",
+"m  c #727272",
+"M  c gray45",
+"N  c gray46",
+"B  c #777777",
+"V  c gray48",
+"C  c #7B7B7B",
+"Z  c gray49",
+"A  c #7E7E7E",
+"S  c #808080",
+"D  c #838383",
+"F  c #868686",
+"G  c gray53",
+"H  c #898989",
+"J  c gray54",
+"K  c #8D8D8D",
+"L  c #8E8E8E",
+"P  c gray56",
+"I  c gray57",
+"U  c #929292",
+"Y  c #959595",
+"T  c gray59",
+"R  c #9A9A9A",
+"E  c #9B9B9B",
+"W  c gray61",
+"Q  c #9D9D9D",
+"!  c gray64",
+"~  c #A4A4A4",
+"^  c gray65",
+"/  c #A7A7A7",
+"(  c #AFAFAF",
+")  c #B2B2B2",
+"_  c gray70",
+"`  c gray71",
+"'  c gray73",
+"]  c gray74",
+"[  c gray",
+"{  c #C0C0C0",
+"}  c gray76",
+"|  c #CACACA",
+" . c gray81",
+".. c gray82",
+"X. c gray84",
+"o. c #D8D8D8",
+"O. c #E2E2E2",
+"+. c gray89",
+"@. c #E6E6E6",
+"#. c gray93",
+"$. c #F8F8F8",
+"%. c #F9F9F9",
+"&. c gray100",
+"*. c None",
+/* pixels */
+"            *.*.*.*.*.*.*.*.*.*.",
+"  : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.",
+"  6 t i C : *.*.*.*.*.*.*.*.*.*.",
+"  6 t a C = *.*.*.*.*.*.*.*.*.*.",
+"  6 i f C @ *.*.*.*.            ",
+"  6 a f B   *.*.l + D l v l :   ",
+"  3 r n F 1 H P 3 n | U M -   *.",
+"  = U [ r ! &.Q f t C |     *.*.",
+"  F %.: a #.&.' C & v &.[ *.*.*.",
+"*.^ ..E E %.&.^ o.X.] &.@.: *.*.",
+"*.k &.] E &.&.Q O.&.` ` k   *.*.",
+"*.q ] ) D ( ] H U X.! 3   *.*.*.",
+"*.# 3 0 i [ +.U U &.P     *.*.*.",
+"*.& i t a | &./ B U k b :   *.*.",
+"*.@ 6 0 1 & q :   + r f r     *.",
+"*.          *.*.*.            *."
+};
--- kdemultimedia-3.5.0.orig/debian/icons/artscontrol.xpm
+++ kdemultimedia-3.5.0/debian/icons/artscontrol.xpm
@@ -0,0 +1,183 @@
+/* XPM */
+static char *artscontrol[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 161 2",
+"   c black",
+".  c gray2",
+"X  c #070707",
+"o  c #090909",
+"O  c gray5",
+"+  c gray6",
+"@  c #1A0B03",
+"#  c #1A0F00",
+"$  c #1D1207",
+"%  c #121217",
+"&  c #191919",
+"*  c gray12",
+"=  c #211607",
+"-  c gray17",
+";  c #2F2F3A",
+":  c gray20",
+">  c #343442",
+",  c #4A2F0D",
+"<  c #573605",
+"1  c #52310C",
+"2  c #74450E",
+"3  c #494946",
+"4  c gray30",
+"5  c gray31",
+"6  c #4B4B56",
+"7  c #565656",
+"8  c gray34",
+"9  c gray35",
+"0  c #5B5B5B",
+"q  c gray38",
+"w  c #626262",
+"e  c #646464",
+"r  c #60606B",
+"t  c #6C666D",
+"y  c #6A6A6A",
+"u  c gray42",
+"i  c #6F6F6F",
+"p  c #727272",
+"a  c gray45",
+"s  c #747474",
+"d  c gray46",
+"f  c #777777",
+"g  c gray47",
+"h  c #797979",
+"j  c #7C7C7C",
+"k  c gray50",
+"l  c #7F7F80",
+"z  c #7E7E8A",
+"x  c #89847E",
+"c  c #C78017",
+"v  c #CE951C",
+"b  c #C2962C",
+"n  c #CA9B25",
+"m  c #FD9D13",
+"M  c #FAA40E",
+"N  c #FFA111",
+"B  c #FFA810",
+"V  c #FDAC11",
+"C  c #FFAD14",
+"Z  c #FFB919",
+"A  c #DDAE49",
+"S  c #E1B343",
+"D  c #E9BA57",
+"F  c #EEBD5C",
+"G  c #FFC125",
+"H  c #FFC625",
+"J  c #FFCC28",
+"K  c #808080",
+"L  c #8E8985",
+"P  c gray54",
+"I  c #8B8B8A",
+"U  c #8B8B8B",
+"Y  c #8A8A8D",
+"T  c gray55",
+"R  c #8D8D8D",
+"E  c #8E8E8E",
+"W  c gray56",
+"Q  c #898992",
+"!  c #8C8E93",
+"~  c #909090",
+"^  c #929291",
+"/  c #929292",
+"(  c #939393",
+")  c #9B9B9B",
+"_  c #9B9B9C",
+"`  c gray62",
+"'  c #9F9F9F",
+"]  c #9393A4",
+"[  c #A39D95",
+"{  c #A1A1A0",
+"}  c gray63",
+"|  c gray64",
+" . c #A4A4A4",
+".. c #A5A5A5",
+"X. c #A5A5A7",
+"o. c gray65",
+"O. c #A7A7A7",
+"+. c gray66",
+"@. c #AAAAAA",
+"#. c gray68",
+"$. c #AEAEAE",
+"%. c #AEAEB3",
+"&. c #AEAEB4",
+"*. c gray69",
+"=. c #B5B5B7",
+"-. c #B6B6B6",
+";. c #B7B7B7",
+":. c #B4B4BC",
+">. c gray72",
+",. c #BBBBBB",
+"<. c #B9BABC",
+"1. c gray74",
+"2. c gray",
+"3. c gray75",
+"4. c #C0C0BF",
+"5. c #C1C1C1",
+"6. c gray77",
+"7. c #C5C5C5",
+"8. c #C6C6C6",
+"9. c #C6C6C7",
+"0. c #C8C5CA",
+"q. c #CAC6C8",
+"w. c #CCCCCB",
+"e. c gray80",
+"r. c #CECECE",
+"t. c gray81",
+"y. c #C5C5D0",
+"u. c #CFCFD3",
+"i. c #CED0DE",
+"p. c #D0D0D0",
+"a. c gray82",
+"s. c LightGray",
+"d. c gray84",
+"f. c #D2D2DE",
+"g. c #D8D8D8",
+"h. c #D1D3E2",
+"j. c #D5D5E1",
+"k. c #D7D9E2",
+"l. c #DADAE2",
+"z. c #DBDBE2",
+"x. c #DCDCE1",
+"c. c #DFE0E2",
+"v. c #E2E2E2",
+"b. c #E4E4E4",
+"n. c #E6E6EA",
+"m. c #E6E6EB",
+"M. c #E7E7EB",
+"N. c gray91",
+"B. c #E9E9ED",
+"V. c #EAEAEF",
+"C. c #FBF6EB",
+"Z. c gray94",
+"A. c #F1F1F1",
+"S. c #F1F1F9",
+"D. c #F6F6F8",
+"F. c #F9F9F9",
+"G. c #F8F8FA",
+"H. c #F9F9FB",
+"J. c gray99",
+"K. c gray100",
+"L. c None",
+/* pixels */
+"L.L.L.L.: q ~ | #.#.o.f * L.L.L.",
+"L.L.L.O R >.W p y u f ` 1.8   L.",
+"L.L.  E 6.j d f d d f d R t.8   ",
+"L.L.4 s.W R W X.1.>.) E P o.9.& ",
+"L.  ~ 9._ { 4.A.H.A.g.$.{ | s.8 ",
+"L.X &.B.u.=.w.g.d.t.6.1.=.=.s.i ",
+"L.  Y M.K.x.X.X.o.o.' *.w.t.s.0 ",
+"r   3 :.H.H.%.P k x ~ t.b.v.*.- ",
+"y.Q 6 z.G.m.g.c.1.9.N.J.Z.1.w   ",
+"z S.z.B.M.i.0.C.K.K.G.g. .e O L.",
+"% ] j.h.i.0.A S [ ! k j 5 o L.L.",
+"L.X ; > t D M V b L <.@.& L.L.L.",
+"L.L.L.L.$ v J G Z F x &   L.L.L.",
+"L.L.L.L.L.= n H N B < L.L.L.L.L.",
+"L.L.L.L.L.L.$ c C m , L.L.L.L.L.",
+"L.L.L.L.L.L.L.@ 2 1   L.L.L.L.L."
+};
--- kdemultimedia-3.5.0.orig/debian/krec.lintian
+++ kdemultimedia-3.5.0/debian/krec.lintian
@@ -0,0 +1,3 @@
+krec: no-shlibs-control-file usr/lib/libkdeinit_krec.so
+krec: postinst-must-call-ldconfig usr/lib/libkdeinit_krec.so
+krec: postrm-should-call-ldconfig usr/lib/libkdeinit_krec.so
--- kdemultimedia-3.5.0.orig/debian/control
+++ kdemultimedia-3.5.0/debian/control
@@ -0,0 +1,282 @@
+Source: kdemultimedia
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@the-barrel.org>, Riku Voipio <riku.voipio@iki.fi>, Luk Claes <luk@debian.org>
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-2), libxaw-headers, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libakode-dev
+Standards-Version: 3.6.2
+
+Package: kdemultimedia
+Section: kde
+Architecture: all
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Suggests: kdemultimedia-doc-html (>= ${Source-Version})
+Description: multimedia apps from the official KDE release 
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes a collection of multimedia applications
+ (such as sound and movie player, mixers and plugins) provided with
+ the official release of KDE.
+ .
+ Homepage: http://www.kde.org/areas/multimedia
+
+Package: kdemultimedia-dev
+Section: devel
+Architecture: any
+Depends: kdelibs4-dev (>= 4:3.5-rc2), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Conflicts: libmpeg-dev
+Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
+Description: development files for the KDE multimedia module
+ Development files and headers for the KDE multimedia module.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE multimedia documentation in HTML format
+ By default the modules provided by KDE only provide their documentation
+ in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the KDE multimedia documentation converted to
+ HTML format so it can be read with any web browser.
+ .
+ The documentation will be installed into the usual directories
+ /usr/share/doc/kde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/kde/HTML/en/juk/. Documentation is provided for most
+ KDE multimedia packages.
+ .
+ This package is part of KDE, and a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: artsbuilder
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase-data (<< 4:3.3.91), kdemultimedia-dev (<< 4:3.4.3-2)
+Description: synthesizer designer for aRts
+ This is the analog Realtime synthesizer's graphical design tool.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: juk
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}, libtunepimp-bin
+Suggests: khelpcenter
+Description: music organizer and player for KDE
+ JuK (pronounced "jook") is a jukebox and music manager for the KDE
+ desktop similar to jukebox software on other platforms such as
+ iTunes or RealOne.
+ .
+ Some of JuK's features include:
+  * Support for Ogg Vorbis and MP3 formats
+  * Tag editing support for both formats, including ID3v2 for MP3 files.
+    Multitagging or editing a selection of multiple files at once is also
+    supported
+  * Output to either the aRts, default KDE sound system, or GStreamer
+  * Managment of your "collection" and multiple playlists
+  * Import and export to m3u playlists
+  * Binary caching of audio meta-data and playlist information for faster
+    load times (starting with the second time you run JuK)
+  * Integration into KDE that allows drag-and-drop and clipboard usage
+    with other KDE and X apps
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kaboodle
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: libarts1-xine
+Suggests: khelpcenter
+Description: light, embedded media player for KDE
+ Kaboodle is a light, embedded media player, supporting both video and audio,
+ for KDE. It uses the aRts framework for playing media files.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kaudiocreator
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins (= ${Source-Version})
+Recommends: vorbis-tools, flac
+Suggests: lame
+Description: CD ripper and audio encoder frontend for KDE
+ KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
+ keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
+ searches CDDB to retrieve the information of the disk.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdemultimedia-kio-plugins (<< 4:3.5.0)
+Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+ au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kappfinder-data
+Section: kde
+Architecture: any
+Depends: kappfinder
+Description: multimedia data for kappfinder
+ This package provides data on multimedia applications for kappfinder.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kio-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: lame
+Conflicts: kdebase-audiolibs (<< 4:3.0.0)
+Replaces: kdebase-audiolibs (<< 4:3.0.0)
+Description: enables the browsing of audio CDs under Konqueror
+ This package allow audio CDs to be browsed like a file system using
+ Konqueror and the audiocd:/ URL.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kmid
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: MIDI/karaoke player for KDE
+ This package provides a MIDI and karaoke player for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kmix
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Provides: x-audio-mixer
+Description: sound mixer applet for KDE
+ This package includes KDE's dockable sound mixer applet.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: krec
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: sound recorder utility for KDE
+ This is a sound recording utility for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kscd
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: audio CD player for KDE
+ This is KDE's audio CD player.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-akode
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: akode plugin for aRts
+ This package contains akode plugins for aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information
+
+Package: libarts1-audiofile
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: audiofile plugin for aRts
+ This package contains audiofile plugins for aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-mpeglib
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libarts-mpeglib (<< 4:3.0.0)
+Replaces: libarts-mpeglib (<< 4:3.0.0)
+Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
+ This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
+ audio and video.
+ .
+ This is the arts (KDE Sound daemon) plugin.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-xine
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: aRts plugin enabling xine support
+ This package contains aRts' xine plugin, allowing the use of the xine
+ multimedia engine though aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libkcddb1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: CDDB library for KDE
+ The KDE native CDDB (CD Data Base) library, providing easy access to Audio
+ CD meta-information (track titles, artist information, etc.) from on-line
+ databases, for KDE applications.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: mpeglib
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: libarts1-mpeglib (= ${Source-Version})
+Description: mp3 and mpeg I audio and video library
+ mpeglib is a mpeg I and mp3 audio and video library. It supports
+ mpeg I audio (layers I, II, III), mpeg I video, mpeg I system layer,
+ and wav playback.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: noatun
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, noatun-plugins
+Description: media player for KDE
+ Noatun is an aRts-based audio and video player for KDE. It supports all
+ formats supported by your installation of aRts (including aRts plugins).
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
--- kdemultimedia-3.5.0.orig/debian/rules
+++ kdemultimedia-3.5.0/debian/rules
@@ -0,0 +1,29 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--with-alsa --with-arts-alsa \
+	--with-extra-includes=/usr/include/speex:/usr/include/kde/arts
+	# The include/kde/arts one should be temporary. See
+	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
+
+DOC_HTML_PRUNE := kcontrol
+
+PACKAGES_WITH_LIBS := artsbuilder kdemultimedia-kio-plugins kmid kmix krec \
+	libarts1-akode libarts1-audiofile libarts1-mpeglib libarts1-xine \
+	libkcddb1 mpeglib noatun
+
+DEB_DH_MAKESHLIBS_ARGS_artsbuilder	:= -V'artsbuilder (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmid		:= -V'kmid (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkcddb1	:= -V'libkcddb1 (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_mpeglib		:= -V'mpeglib (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_noatun		:= -V'noatun (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib	:= -V'libarts1-mpeglib (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins := -V'kdemultimedia-kio-plugins (>= 4:3.5-rc1-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
--- kdemultimedia-3.5.0.orig/debian/libarts1-xine.lintian
+++ kdemultimedia-3.5.0/debian/libarts1-xine.lintian
@@ -0,0 +1 @@
+libarts1-xine: no-shlibs-control-file usr/lib/libarts_xine.so
--- kdemultimedia-3.5.0.orig/debian/mpeglib.install
+++ kdemultimedia-3.5.0/debian/mpeglib.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/yaf-cdda
+debian/tmp/usr/bin/yaf-mpgplay
+debian/tmp/usr/bin/yaf-splay
+debian/tmp/usr/bin/yaf-tplay
+debian/tmp/usr/bin/yaf-vorbis
+debian/tmp/usr/bin/yaf-yuv
+debian/tmp/usr/lib/libmpeg-0.3.0.so
--- kdemultimedia-3.5.0.orig/debian/changelog
+++ kdemultimedia-3.5.0/debian/changelog
@@ -0,0 +1,1013 @@
+kdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Tighten version of Replaces on kdemultimedia-kfile-plugins
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:33:11 +0000
+
+kdemultimedia (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:28:19 +0000
+
+kdemultimedia (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 22:58:10 +0000
+
+kdemultimedia (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 19:15:18 +0000
+
+kdemultimedia (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  +++ Changes by Christopher Martin:
+
+  * aKode has been dropped from kdemultimedia, and is now a separate source
+    package. To use arts with akode, install the libarts1-akode package,
+    which contains a plug-in that links the two systems.
+
+  * Add a manpage for kaudiocreator, courtesy of Francois Wendling.
+    (Closes: #337166)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 12 Nov 2005 08:43:06 -0500
+
+kdemultimedia (4:3.4.3-3) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Patch mpeglib's mmxidct_asm.S to set PT_GNU_STACK, so that
+    libmpeg-0.3.0.so is not marked as requiring an executable stack. Tests
+    with an exec-shield kernel didn't uncover any problems.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 21 Oct 2005 10:02:42 -0400
+
+kdemultimedia (4:3.4.3-2) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Move libartscontrol .la files from kdemultimedia-dev to artsbuilder,
+    allowing the artsbuilder kicker applet to start without kdemultimedia-dev
+    being installed. (Closes: #334716)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 20 Oct 2005 09:50:13 -0400
+
+kdemultimedia (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which disables MMX optimizations in the mpeglib package for
+    the i386 architecture. These were causing the library to contain non-PIC
+    code.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 11:27:27 -0400
+
+kdemultimedia (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdemultimedia also makes gcc 4.0
+    ICE as described in #323133.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 04 Sep 2005 22:42:25 +0200
+
+kdemultimedia (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  
+  * Rebuild closes: #317423, #317205
+
+  +++ Changes by Christopher Martin:
+
+  * Remove 07_xlibs-static-pic.diff and the xlibs-static-pic build-dependency,
+    and add a build-dependency on libxxf86dga-dev, for the X.Org transition.
+
+  * Improve libkcddb1 package description. (Closes: #312191)
+
+  +++ Changes by Luk Claes:
+  
+  * Added me to uploaders
+
+  * Updated FSF's address
+  
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Aug 2005 19:18:45 +0200
+
+kdemultimedia (4:3.4.3-0ubuntu2) dapper; urgency=low
+
+  * Build with GCC 3.4 on arches which fail using GCC 4.0
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Oct 2005 01:42:26 +0100
+
+kdemultimedia (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:45:40 +0000
+
+kdemultimedia (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 12:37:36 +0000
+
+kdemultimedia (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+  * Add all packages back to meta-package
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:41:30 +0000
+
+kdemultimedia (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+
+  * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 23:08:10 +0000
+
+kdemultimedia (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+  * Change kubuntu_02_hide_arts_menu_entries.diff to use NoDisplay
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 12:49:46 +0000
+
+kdemultimedia (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * Add kubuntu_02_hide_arts_menu_entries.diff to hide artsbuilder and artscontrol k-menu entries
+
+ -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 04:48:58 +0000
+
+kdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Remove artsbuilder, kmid, krec depends from kdemultimedia meta-package.
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:37:33 +0000
+
+kdemultimedia (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Add patch kubuntu_01_tracksimp_fix.diff to fix 
+    slow KAudioCreator problem
+    http://bugs.kde.org/show_bug.cgi?id=98477
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 03:02:41 +0000
+
+kdemultimedia (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Sync with Debian
+  * Separate akode's mpeg support into new package akode-mpeg.
+  * Remove mpeg dependencies from kdemultimedia metapackage.
+  * Remove noatun and kaboodle from meta-package
+
+ -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 02:13:08 +0000
+
+kdemultimedia (4:3.4.0-0pre2) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - no longer FTBFS on amd64/gcc-4.0, upstream applied patch by Andreas
+      Jochens. (Closes: #287095)
+
+  +++ Changes by Adeodato Simó:
+
+  * Switch to CDBS for packaging.
+
+  * Add the following build-dependencies: libgstreamer-plugins0.8-dev,
+    libltdl3-dev, libtheora-dev. Require libspeex-dev at (>> 1.1.5).
+
+  * Created XPM icons for packages having a menu file. Install them in
+    /usr/share/pixmaps and update the menu entries to use them.
+
+  +++ Changes by Christopher Martin:
+
+  * New kdebase-doc-html package, containing doc-base registered HTML
+    versions of application handbooks, for users without Konqueror or
+    KHelpCenter.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
+
+kdemultimedia (4:3.3.2-1ubuntu4) hoary; urgency=low
+
+  * changed a depends for akode, libflac4 to libflac6 which isnt anymore 
+    in archive. Hoary has libflac6 at the moment which comes
+    from package flac. Thanks to Sébastien Filleul reporting this problem.
+    
+
+ -- Andreas Mueller <amu@canonical.com>  Sat, 15 Jan 2005 13:25:04 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu3) hoary; urgency=low
+
+  *  added missing builddepends libxinerama-dev 
+
+ -- Andreas Mueller <amu@canonical.com>  Sun, 26 Dec 2004 18:40:55 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu2) hoary; urgency=low
+
+  * added missing builddepends libxinerama1 
+
+ -- Andreas Mueller <amu@canonical.com>  Sun, 26 Dec 2004 03:03:14 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+  * Remove patches:
+    - 01_kdemultimedia_branch
+    - 02_autotools_update
+    - 05_pedantic-errors
+    - 06_xlibs-static-pic
+  * Don't run cvs-clean.pl if debian/patches exists
+
+ -- Chris Halls <chris.halls@credativ.co.uk>  Mon, 13 Dec 2004 13:30:17 +0000
+
+kdemultimedia (4:3.3.2-1) unstable; urgency=low
+
+  * This upload is compiled against libflac6, so akode 3.3.2 is now
+    installable in sid (was broken in experimental). Closes: #295485
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Fix debian/copyright to refer to License rather than to Copyright
+    when discussing KDE's licenses.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 01 Mar 2005 22:02:05 +0100
+
+kdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update.
+
+  * New man pages:
+    - kaboodle.1 by Karolina Lindqv. (Closes: #192567)
+    - kmix.1 and kmixctrl.1 by Clément Stenac. (Closes: #207128)
+    - krec.1 by Ryan Waye. (Closes: #258812)
+      [Forgot to include krec.manpages in previous upload.]
+
+  * debian/control:
+    - make kaudiocreator recommend vorbis-tools. (Closes: #285236)
+    - improve the akode package description. (Closes: #264624, #277822)
+    - make akode Enhance: libarts1.
+    - removed build-dependency on automake1.9.
+    - drop the 'KDE is a powerful...' blurb from juk's description, since
+      it has an appropriate long description.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Mon, 20 Dec 2004 03:20:59 +0100
+
+kdemultimedia (4:3.3.1-2) unstable; urgency=high
+
+  * Upload to rebuild against libflac6. Urgency set to high since there are
+    packages fixing RC bugs that can't enter sarge due to the transition not
+    being ready. (Closes: #289343)
+
+  +++ Changes by Adeodato Simó:
+
+  * debian/control:
+    - version Build-Dependency on libflac-dev to (>= 1.1.1-3).
+    - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 13 Jan 2005 05:17:03 +0100
+
+kdemultimedia (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * debian/control:
+    - fix indentation in juk's description. (Closes: #216642)
+    - replace trm with libtunepimp-bin. (Closes: #266050)
+    - remove Build-Depends on libkdegst0.6-dev. (Closes: #257497)
+  * debian/noatun.mime:
+    - Pass --nofork option to noatun. (Closes: #278113)
+  * debian/man/krec.1
+    - new manpage by Ryan Waye. (Closes: #258812)
+  * debian/patches/10_dont-define-__u64.diff
+    - new patch by Peter Reinholdtsen to fix FTBFS on alpha and ia64.
+      (Closes: #270502)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon,  8 Nov 2004 03:30:00 -0600
+
+kdemultimedia (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 14 Aug 2004 06:00:00 -0500
+
+kdemultimedia (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Added libkcddb/configbase.h to kdemultimedia-dev. (Closes: #258649)
+  * Build-Depends: xlibs-static-pic. (Closes: #260749)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 19:00:00 -0500
+
+kdemultimedia (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 16 Apr 2004 02:00:00 -0500
+
+kdemultimedia (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated noatun ogg mimetype entry. (Closes: #235265)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat,  6 Mar 2004 01:00:00 -0600
+
+kdemultimedia (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 19 Feb 2004 16:00:00 -0600
+
+kdemultimedia (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 27 Jan 2004 03:00:00 -0600
+
+kdemultimedia (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Updated kaboodle Description. (Closes: #181548)
+  * Added cdromAccess_Linux.cpp __u64 removal patch. (Closes: #226371)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 13 Jan 2004 18:00:00 -0600
+
+kdemultimedia (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Document how to use timidity with kmid. (Closes: #195019)
+  * kaudiocreator Depends kdemultimedia-kio-plugins. (Closes: #196686)
+  * kaboodle Recommends libarts1-xine. (Closes: #214118)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon, 05 Jan 2004 19:23:22 -0600
+
+kdemultimedia (4:3.1.2-1.4) unstable; urgency=low
+
+  * NMU
+  * Complete patch to stop including <linux/cdrom.h>.  I forgot a few
+    places.  The replacement <linux-cdrom.h> is placed in debian/.
+    Store the changes as debian/patches/no-cdrom-h.diff.
+  * Moved C++ fixes into debian/patches/no-varsize-arr.diff and
+    debian/patches/correct-cplusplus.diff.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 12 Nov 2003 23:04:27 +0100
+
+kdemultimedia (4:3.1.2-1.3) unstable; urgency=low
+
+  * NMU.
+  * Stop using <linux/cdrom.h>, and move the parts needed into
+    a standalone <linux-cdrom.h> instead. (Closes: #220310)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 23:14:06 +0000
+
+kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
+
+  * NMU
+  * Fix code errors to get this compiling with gcc 3.3.  Patches in BTS.
+    - Swap QString.insert() arguments to get them to make
+      sense. (Closes: #220174)
+    - Comment out inline assembly macro. (Closes: #220176)
+    - Make sure subclasses inherit publicly from class
+      KListViewItem. (Closes: #220179)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
+
+kdemultimedia (4:3.1.2-1.1) unstable; urgency=low
+
+  * NMU
+  * Fix g++ 3 compile error, patch in bts.  Closes: #203919
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 27 Aug 2003 07:11:30 -0600
+
+kdemultimedia (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 May 2003 11:00:00 -0500
+
+kdemultimedia (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #180616)
+  * Add 'chmod +x configure' to rules. (Closes: #181205, #181355, #181561)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 13:00:00 -0600
+
+kdemultimedia (4:3.1.0-1) unstable; urgency=low
+
+  * New Upstream.
+  * Redo Debian dir.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 04 Feb 2003 23:00:00 -0600
+
+kdemultimedia (4:2.2.2-8.2) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Added special detection routine for big/little endianess on MIPS since
+    the line "byteorder : {big|little} endian" from /proc/cpuinfo was
+    removed as of Linux 2.4.20, resulting in the mipsel buildd being
+    unable to build this package.
+
+ -- Martin Schulze <joey@infodrom.org>  Wed, 22 Jan 2003 15:00:51 +0100
+
+kdemultimedia (4:2.2.2-8.1) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patches to fix several potential vulnerabilities.
+    http://www.kde.org/info/security/advisory-20021220-1.txt
+
+ -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 08:53:19 +0100
+
+kdemultimedia (4:2.2.2-8) unstable; urgency=high
+
+  * Updated Build-Depends (Closes: #132015)
+  * Actually apply the PowerPC fix that Daniel thought he did.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed,  6 Mar 2002 14:00:00 -0600
+
+kdemultimedia (4:2.2.2-7) unstable; urgency=high
+
+  * Changing Maintainer to Chris.
+  * De-b0rking PowerPC stuff.
+
+ -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 21:35:53 +1100
+
+kdemultimedia (4:2.2.2-6) unstable; urgency=low
+
+  * Adopting orphaned package; thanks to Ivan for all his work.
+    (closes: #127707)
+  * debian/control:
+    - Make kdemultimedia-dev depend on libesd0-dev. (closes: #127806)
+
+ -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:28:30 -0500
+
+kdemultimedia (4:2.2.2-5) unstable; urgency=low
+
+  * Build with new png
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 28 Dec 2001 13:32:00 -0700
+
+kdemultimedia (4:2.2.2-4) unstable; urgency=low
+
+  * Don't disable the alsa test (Closes: #124132)
+  * Change recommends to depends for kdebase-libs
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 04:53:00 -0700
+
+kdemultimedia (4:2.2.2-3) unstable; urgency=low
+
+  * Build cleanup
+  * Documentation updates for freeze
+  * Dep/Build-dep/etc cleanup
+  * Sync with upstream
+  * Add -ffunction-sections to CXXFLAGS for hppa
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 02:30:00 -0700
+
+kdemultimedia (4:2.2.2-2) unstable; urgency=low
+
+  * Add missing build-depend - libasound2-dev
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2001 01:53:00 -0700
+
+kdemultimedia (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Change maintainer
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 19:30:00 -0700
+
+kdemultimedia (4:2.2.1-1.4) unstable; urgency=low
+
+  * don't check for auto* as it hoses things
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:30:00 -0700
+
+kdemultimedia (4:2.2.1-1.3) unstable; urgency=low
+
+  * Fix configure (Closes: #114577)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 09:35:00 -0700
+
+kdemultimedia (4:2.2.1-1.2) unstable; urgency=low
+
+  * don't worry about automake 1.5
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 09:35:00 -0700
+
+kdemultimedia (4:2.2.1-1.1) unstable; urgency=low
+
+  * Fix conflicts
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:51:00 -0700
+
+kdemultimedia (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Change maintainer
+  * Lintian error cleanup
+  * PIC vs. non-PIC code cleanup
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Aug 2001 14:41:00 -0700
+
+kdemultimedia (4:2.2.0-final-1) unstable; urgency=low
+  
+  * New upstream version 2.2
+  * Fix build issues (Closes: #107281)
+  * Don't link to Xv (Closes: #108261)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Aug 2001 02:03:00 -0700
+
+kdemultimedia (4:2.2.0-0.2beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:51:00 -0700
+
+kdemultimedia (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * More Build-Depends and Depends work
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 18 Jul 2001 00:24:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:40:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * sync with upstream
+  * Autobuild for alpha
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Jul 2001 02:25:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * Fix seg (Closes: #102647)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 19:15:00 -0700
+
+kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream pull
+  * 2.2 beta1
+  * Adding: Enhances: tags
+  * Adding in notation in kscd README.Debian about the fact that CDDB is
+    not supported due to licensing issues. (Closes: #96435)
+  * Rename libmpeglib0 to mpeglib and remove libmpeglib-dev
+  * Rename arts to artsbuilder as it's less likely to confuse people plus
+    is the proper name for it.
+  * rename timidity to ktimidity and provide timidity yet we don't conflict
+    with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files
+    for timidity/kmidi to /etc/kde2/kmidi and conffile them all.  kmidi and
+    ktimidity both seem to work find for me here now...hopefully it will do
+    the same for you folks.
+  * Build kmidi/ktimidity with support for most of it's different interfaces. 
+    Not sure if this is how it'll end up being in the end.  This includes the
+    default Xaw, Ncurses, and Slang.
+  * Fixes these problems: 
+        noatun segfaults (Closes: #88585)
+  * Fix formatting (Closes: #99945)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdemultimedia (4:2.1.1-2) unstable; urgency=low
+ 
+  * Update menu bits to include new kde menu removal tag
+  * a few upstream fixes
+  * Update build-depends to recognize real | virtual
+  * Adding menu entry for kmid...oops
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 15:34:00 -0700
+
+kdemultimedia (4:2.1.1-1.0.1) unstable; urgency=low
+ 
+  * Rebuild with old libc
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 15:44:00 -0700
+
+kdemultimedia (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 22:07:00 -0700
+
+kdemultimedia (4:2.1.0-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Update shlibs and overrides
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 21:48:00 -0700
+
+kdemultimedia (4:2.1.0-1) unstable; urgency=low
+ 
+   * Re-pulling from CVS instead of using the official tarballs.  The
+     official tarballs had problems which made it hard to handle patches
+   * Version changed to 2.1.0 instead of 2.1-final as we are post 2.1-final
+     and pre 2.1.1 which will be released in about a month.  This also allows
+     for the source upload.
+   * Update build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 01:49:00 -0700
+
+kdemultimedia (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+  * Adding in mp3-decoder provides for noatun
+  * Fixing confliction (Closes: #84880)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdemultimedia (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+  * More upstream fixes to noatun
+  * Removing old --enable-debug
+  * Removing guid stuff from kscd as upstream disabled suid execution
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:42:00 -0700
+
+kdemultimedia (4:2.1-beta2-2) unstable; urgency=low
+ 
+  * Fixing Build-Depends
+  * More upstream fixes for noatun
+  * not --enable'ng esd as it doesn't seem to work and ends up forcing esd
+    libs for packages that don't work with it.
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 Jan 2001 00:12:00 -0700
+
+kdemultimedia (4:2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 01:30:00 -0700
+
+kdemultimedia (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * kaiman removed.  (Closes: #77449)
+    noatun now kde2.1 media player
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdemultimedia (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:16:00 -0700
+
+kdemultimedia (4:2.1-20010101-2) unstable; urgency=low
+ 
+  * Fixing file placement for noatun
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 04 Jan 2001 11:37:00 -0700
+
+kdemultimedia (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+	  
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:00:00 -0700
+
+kdemultimedia (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency cleanup..we don't need kdebase-libs and arts for 
+    most of these apps
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:00:00 -0700
+
+kdemultimedia (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * New upstream beta version
+  * i18n patch for kaimam applied
+  * new noatun package
+  * Migrating mpeglib packages back into kdemultimedia
+  * Adding in missing conflicts for kdemultimedia
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 18:46:00 -0700
+
+kdemultimedia (4:2.0-final-7) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing a packaging problem with task package
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Nov 2000 06:16:00 -0700
+
+kdemultimedia (4:2.0-final-6) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing shlibs
+  * Adding lintian overrides
+  * Fixing build rules
+  * documentation work
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 08:20:00 -0700
+
+kdemultimedia (4:2.0-final-5) unstable; urgency=low
+ 
+  * building with --enable-debug as it seems kmidi croaks if built without
+    debug
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 01:10:00 -0700
+
+kdemultimedia (4:2.0-final-4.2) unstable; urgency=low
+ 
+  * more dependency work
+  * fixing build pieces for non-i386 systems
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 03:30:00 -0700
+
+kdemultimedia (4:2.0-final-4.1) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+
+kdemultimedia (4:2.0-final-4) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * more i18n fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * more work on kmidi, kmid, and kaiman
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-3) unstable; urgency=low
+ 
+  * more upstream fixes
+  * Fixes mp3 playing with aRTs (Closes: #76141)
+  * Fixes mime types (Closes: #75975)
+  * build against new xlibs
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdemultimedia (4:2.0-final-0) unstable; urgency=low
+
+  * KDE 2.0
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+
+kdemultimedia (4:2.0-20001011-2) unstable; urgency=low
+ 
+  * Trying to fix up kmidi
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 19:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling against non-versioned kdelibs once again
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001002-0) unstable; urgency=low
+  
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20000925-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More work on kmidi - Moving timidity patches into the proper dir
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 06:00:00 -0700
+
+kdemultimedia (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Kmid should build properly now
+  * Should build out of the box now
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdemultimedia (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdemultimedia (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000911-1) unstable; urgency=low
+ 
+  * Removing aktion from package since it depends on non-free xanim
+  * Adding more information to copyright file
+  * More shlibs fixups for arts and kscd
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 09:45:00 -0700
+
+kdemultimedia (4:2.0-20000911-0) unstable; urgency=low
+ 
+  * more upstream fixes
+  * More kmidi fixes
+  * Breaking kdemultimedia down
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Sep 2000 04:30:00 -0700
+
+kdemultimedia (4:2.0-20000909-0) unstable; urgency=low
+
+  * more upstream fixes
+  * Not providing TIMIDITY 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000901-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 16:00:00 -0700
+
+kdemultimedia (4:2.0-20000827-0) experimental; urgency=low
+ 
+  * more upstream fixes
+  * more build fixes 
+  * merging package changes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 27 Aug 2000 19:30:00 -0700     
+
+kdemultimedia (4:2.0-20000825-1.0) experimental; urgency=low
+ 
+  * Build fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000823-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 23 Aug 2000 16:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 17:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20000623-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 23 Jun 2000 07:10:00 -0700
+                                                                                
+kdemultimedia-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000303-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 03 Mar 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * new cvs version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:00:42 -0400
+
+kdemultimedia-cvs (4:2.0-19990822-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 08:00:42 -0400
+
+kdemultimedia-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version
+  * making paths completly configurable via debianrules
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 27 Jun 1999 18:54:42 +0200
+
+kdemultimedia-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * new upstream CVS version 
+  * migrating out of /opt to /
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:30:09 -0400
+
+kdemultimedia (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
+
+kdemultimedia (4:1.1-19990207-3) unstable; urgency=low
+
+  * install kscd setgrp cdrom
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 00:49:47 +0100
+
+kdemultimedia (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the wrong libjpeg version
+  * depend on cddb for kscd
+
+ -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:44 +0100
+
+kdemultimedia (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:59 +0100
+
+kdemultimedia (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
+
+kdemultimedia (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 18:01:56 +0200
+
+kdemultimedia (2:980331-1) frozen; urgency=low
+
+  * let it depend on kdebase for the help system
+  * fixed old fsf-address
+  * new upstream version with bugfixes
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 23:17:10 +0200
+
+kdemultimedia (2:980311-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstdc++-2.8
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 21:55:40 +0100
+
+kdemultimedia (2:980311-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 12 Mar 1998 21:43:02 +0100
--- kdemultimedia-3.5.0.orig/debian/juk.manpages
+++ kdemultimedia-3.5.0/debian/juk.manpages
@@ -0,0 +1 @@
+debian/man/juk.1
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.kscd
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.kscd
@@ -0,0 +1,11 @@
+Document: kdemultimedia-doc-html-kscd
+Title: KsCD Handbook
+Author: Jonathan Singer, David White, Bernd Johannes Wuebben,
+ Dirk Foersterling, Lauri Watts
+Abstract: KsCD is a small, fast, CDDB-enabled audio CD player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kscd/index.html
+Files: /usr/share/doc/kde/HTML/en/kscd/*.html
+
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.krec
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.krec
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-krec
+Title: KRec Handbook
+Author: Arnold Krille
+Abstract: KRec is a sound recording application for aRts and KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/krec/index.html
+Files: /usr/share/doc/kde/HTML/en/krec/*.html
+
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.kmid
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.kmid
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-kmid
+Title: KMid Handbook
+Author: Antonio Larrosa Jimenez
+Abstract: KMid is a midi/karaoke multimedia player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmid/index.html
+Files: /usr/share/doc/kde/HTML/en/kmid/*.html
+
--- kdemultimedia-3.5.0.orig/debian/libarts1-xine.install
+++ kdemultimedia-3.5.0/debian/libarts1-xine.install
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/kde3/videothumbnail.la
+debian/tmp/usr/lib/kde3/videothumbnail.so
+debian/tmp/usr/lib/libarts_xine.la
+debian/tmp/usr/lib/libarts_xine.so
+debian/tmp/usr/lib/mcop/xineAudioPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/xineVideoPlayObject.mcopclass
+debian/tmp/usr/share/apps/videothumbnail/sprocket-large.png
+debian/tmp/usr/share/apps/videothumbnail/sprocket-medium.png
+debian/tmp/usr/share/apps/videothumbnail/sprocket-small.png
+debian/tmp/usr/share/services/videothumbnail.desktop
--- kdemultimedia-3.5.0.orig/debian/libkcddb1.install
+++ kdemultimedia-3.5.0/debian/libkcddb1.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/lib/kde3/kcm_cddb.la
+debian/tmp/usr/lib/kde3/kcm_cddb.so
+debian/tmp/usr/lib/libkcddb.so.1
+debian/tmp/usr/lib/libkcddb.so.1.0.0
+debian/tmp/usr/share/applications/kde/libkcddb.desktop
+debian/tmp/usr/share/apps/kconf_update/kcmcddb-emailsettings.upd
+debian/tmp/usr/share/config.kcfg/libkcddb.kcfg
--- kdemultimedia-3.5.0.orig/debian/kmid.menu
+++ kdemultimedia-3.5.0/debian/kmid.menu
@@ -0,0 +1,11 @@
+?package(kmid):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="KMid"\
+	icon32x32="/usr/share/pixmaps/kmid.xpm"\
+	icon16x16="/usr/share/pixmaps/kmid-16.xpm"\
+	command="/usr/bin/kmid"
+
+# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm
+# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm
--- kdemultimedia-3.5.0.orig/debian/krec.menu
+++ kdemultimedia-3.5.0/debian/krec.menu
@@ -0,0 +1,11 @@
+?package(krec):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="KRec"\
+	icon32x32="/usr/share/pixmaps/krec.xpm"\
+	icon16x16="/usr/share/pixmaps/krec-16.xpm"\
+	command="/usr/bin/krec"
+
+# Icon 32x32 krec/cr32-app-krec.png krec.xpm
+# Icon 16x16 krec/cr16-app-krec.png krec-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.juk
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.juk
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-juk
+Title: Juk Handbook
+Author: Michael Pyne, Scott Wheeler
+Abstract: Juk is a jukebox, tagger and music collection manager.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/juk/index.html
+Files: /usr/share/doc/kde/HTML/en/juk/*.html
+
--- kdemultimedia-3.5.0.orig/debian/kscd.menu
+++ kdemultimedia-3.5.0/debian/kscd.menu
@@ -0,0 +1,11 @@
+?package(kscd):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="KsCD"\
+	icon32x32="/usr/share/pixmaps/kscd.xpm"\
+	icon16x16="/usr/share/pixmaps/kscd-16.xpm"\
+	command="/usr/bin/kscd"
+
+# Icon 32x32 kscd/cr32-app-kscd.png kscd.xpm
+# Icon 16x16 kscd/cr16-app-kscd.png kscd-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kaudiocreator.menu
+++ kdemultimedia-3.5.0/debian/kaudiocreator.menu
@@ -0,0 +1,11 @@
+?package(kaudiocreator):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="KAudioCreator"\
+	icon32x32="/usr/share/pixmaps/kaudiocreator.xpm"\
+	icon16x16="/usr/share/pixmaps/kaudiocreator-16.xpm"\
+	command="/usr/bin/kaudiocreator"
+
+# Icon 32x32 kaudiocreator/cr32-app-kaudiocreator.png kaudiocreator.xpm
+# Icon 16x16 kaudiocreator/cr16-app-kaudiocreator.png kaudiocreator-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kmid.install
+++ kdemultimedia-3.5.0/debian/kmid.install
@@ -0,0 +1,40 @@
+debian/tmp/usr/bin/kmid
+debian/tmp/usr/lib/kde3/libkmidpart.la
+debian/tmp/usr/lib/kde3/libkmidpart.so
+debian/tmp/usr/lib/libkmidlib.so.0
+debian/tmp/usr/lib/libkmidlib.so.0.0.0
+debian/tmp/usr/share/applications/kde/kmid.desktop
+debian/tmp/usr/share/apps/kmid/DiesIrae.kar
+debian/tmp/usr/share/apps/kmid/Guantanamera.kar
+debian/tmp/usr/share/apps/kmid/MariaDeLasMercedes.kar
+debian/tmp/usr/share/apps/kmid/OFortuna.kar
+debian/tmp/usr/share/apps/kmid/fm/drums.o3
+debian/tmp/usr/share/apps/kmid/fm/drums.sb
+debian/tmp/usr/share/apps/kmid/fm/std.o3
+debian/tmp/usr/share/apps/kmid/fm/std.sb
+debian/tmp/usr/share/apps/kmid/icons/button1.xpm
+debian/tmp/usr/share/apps/kmid/icons/button2.xpm
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/keyboard.xpm
+debian/tmp/usr/share/apps/kmid/kmid_partui.rc
+debian/tmp/usr/share/apps/kmid/kmidui.rc
+debian/tmp/usr/share/apps/kmid/maps/YamahaPSR500.map
+debian/tmp/usr/share/apps/kmid/maps/YamahaPSS790.map
+debian/tmp/usr/share/apps/kmid/maps/YamahaQY10.map
+debian/tmp/usr/share/apps/kmid/maps/gm.map
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmid.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmid.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmid.png
+debian/tmp/usr/share/mimelnk/audio/x-karaoke.desktop
+debian/tmp/usr/share/servicetypes/audiomidi.desktop
+
+debian/icons/kmid.xpm		/usr/share/pixmaps
+debian/icons/kmid-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/krec.install
+++ kdemultimedia-3.5.0/debian/krec.install
@@ -0,0 +1,42 @@
+debian/tmp/usr/bin/krec
+debian/tmp/usr/lib/kde3/kcm_krec.la
+debian/tmp/usr/lib/kde3/kcm_krec.so
+debian/tmp/usr/lib/kde3/kcm_krec_files.la
+debian/tmp/usr/lib/kde3/kcm_krec_files.so
+debian/tmp/usr/lib/kde3/krec.la
+debian/tmp/usr/lib/kde3/krec.so
+debian/tmp/usr/lib/kde3/libkrecexport_ogg.la
+debian/tmp/usr/lib/kde3/libkrecexport_ogg.so
+debian/tmp/usr/lib/kde3/libkrecexport_wave.la
+debian/tmp/usr/lib/kde3/libkrecexport_wave.so
+debian/tmp/usr/lib/libkdeinit_krec.so
+debian/tmp/usr/share/applications/kde/krec.desktop
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileempty.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileplay.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_filerec.png
+debian/tmp/usr/share/apps/krec/krecui.rc
+debian/tmp/usr/share/apps/krec/tips
+debian/tmp/usr/share/doc/kde/HTML/en/krec/common
+debian/tmp/usr/share/doc/kde/HTML/en/krec/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/krec/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-configuration.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-hicolor.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-keramik.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-new_file_properties.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/usr/share/services/kcm_krec.desktop
+debian/tmp/usr/share/services/kcm_krec_files.desktop
+debian/tmp/usr/share/services/krec_exportogg.desktop
+debian/tmp/usr/share/services/krec_exportwave.desktop
+debian/tmp/usr/share/servicetypes/krec_exportitem.desktop
+
+debian/icons/krec.xpm		/usr/share/pixmaps
+debian/icons/krec-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/kscd.install
+++ kdemultimedia-3.5.0/debian/kscd.install
@@ -0,0 +1,32 @@
+debian/tmp/usr/bin/kscd
+debian/tmp/usr/bin/workman2cddb.pl
+debian/tmp/usr/share/applications/kde/kscd.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/audiocd_play.desktop
+debian/tmp/usr/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
+debian/tmp/usr/share/apps/profiles/kscd.profile.xml
+debian/tmp/usr/share/config.kcfg/kscd.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/common
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd11.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd12.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd13.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd14.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd16.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd18.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd19.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd3.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd5.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd6.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd9.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kscd.png
+debian/tmp/usr/share/mimelnk/text/xmcd.desktop
+
+debian/icons/kscd.xpm		/usr/share/pixmaps
+debian/icons/kscd-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/noatun.mime
+++ kdemultimedia-3.5.0/debian/noatun.mime
@@ -0,0 +1,7 @@
+application/ogg;	noatun --nofork %s;	nametemplate=%s.ogg;	test=test "$DISPLAY" != ""
+application/x-ogg;	noatun --nofork %s;	nametemplate=%s.ogg;	test=test "$DISPLAY" != ""
+audio/mpeg;	noatun --nofork %s;	nametemplate=%s.mpg;	test=test "$DISPLAY" != ""
+audio/mpegurl;	noatun --nofork %s;	nametemplate=%s.m3u;	test=test "$DISPLAY" != ""
+audio/x-mp2;	noatun --nofork %s;	nametemplate=%s.mp2;	test=test "$DISPLAY" != ""
+audio/x-mp3;	noatun --nofork %s;	nametemplate=%s.mp3;	test=test "$DISPLAY" != ""
+audio/x-wav;	noatun --nofork %s;	nametemplate=%s.wav;	test=test "$DISPLAY" != ""
--- kdemultimedia-3.5.0.orig/debian/juk.install
+++ kdemultimedia-3.5.0/debian/juk.install
@@ -0,0 +1,27 @@
+debian/tmp/usr/bin/juk
+debian/tmp/usr/share/applications/kde/juk.desktop
+debian/tmp/usr/share/apps/juk/jukui-rtl.rc
+debian/tmp/usr/share/apps/juk/jukui.rc
+debian/tmp/usr/share/apps/juk/pics/playing.png
+debian/tmp/usr/share/apps/juk/pics/splash.png
+debian/tmp/usr/share/apps/konqueror/servicemenus/jukservicemenu.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/juk/common
+debian/tmp/usr/share/doc/kde/HTML/en/juk/history-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/juk/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-adv-search.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-file-renamer.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-main.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-tag-guesser.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/normal-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/search-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/toolbar.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/juk_dock.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/juk.png
+
+debian/icons/juk.xpm		/usr/share/pixmaps
+debian/icons/juk-16.xpm		/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-kfile-plugins.install
+++ kdemultimedia-3.5.0/debian/kdemultimedia-kfile-plugins.install
@@ -0,0 +1,33 @@
+debian/tmp/usr/lib/kde3/kfile_au.la
+debian/tmp/usr/lib/kde3/kfile_au.so
+debian/tmp/usr/lib/kde3/kfile_avi.la
+debian/tmp/usr/lib/kde3/kfile_avi.so
+debian/tmp/usr/lib/kde3/kfile_flac.la
+debian/tmp/usr/lib/kde3/kfile_flac.so
+debian/tmp/usr/lib/kde3/kfile_m3u.la
+debian/tmp/usr/lib/kde3/kfile_m3u.so
+debian/tmp/usr/lib/kde3/kfile_mp3.la
+debian/tmp/usr/lib/kde3/kfile_mp3.so
+debian/tmp/usr/lib/kde3/kfile_mpc.la
+debian/tmp/usr/lib/kde3/kfile_mpc.so
+debian/tmp/usr/lib/kde3/kfile_mpeg.la
+debian/tmp/usr/lib/kde3/kfile_mpeg.so
+debian/tmp/usr/lib/kde3/kfile_ogg.la
+debian/tmp/usr/lib/kde3/kfile_ogg.so
+debian/tmp/usr/lib/kde3/kfile_sid.la
+debian/tmp/usr/lib/kde3/kfile_sid.so
+debian/tmp/usr/lib/kde3/kfile_theora.la
+debian/tmp/usr/lib/kde3/kfile_theora.so
+debian/tmp/usr/lib/kde3/kfile_wav.la
+debian/tmp/usr/lib/kde3/kfile_wav.so
+debian/tmp/usr/share/services/kfile_au.desktop
+debian/tmp/usr/share/services/kfile_avi.desktop
+debian/tmp/usr/share/services/kfile_flac.desktop
+debian/tmp/usr/share/services/kfile_m3u.desktop
+debian/tmp/usr/share/services/kfile_mp3.desktop
+debian/tmp/usr/share/services/kfile_mpc.desktop
+debian/tmp/usr/share/services/kfile_mpeg.desktop
+debian/tmp/usr/share/services/kfile_ogg.desktop
+debian/tmp/usr/share/services/kfile_sid.desktop
+debian/tmp/usr/share/services/kfile_theora.desktop
+debian/tmp/usr/share/services/kfile_wav.desktop
--- kdemultimedia-3.5.0.orig/debian/kaudiocreator.install
+++ kdemultimedia-3.5.0/debian/kaudiocreator.install
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/kaudiocreator
+debian/tmp/usr/share/applications/kde/kaudiocreator.desktop
+debian/tmp/usr/share/apps/kaudiocreator/eventsrc
+debian/tmp/usr/share/apps/kaudiocreator/kaudiocreatorui.rc
+debian/tmp/usr/share/apps/kaudiocreator/pics/check.png
+debian/tmp/usr/share/apps/kconf_update/kaudiocreator-libkcddb.upd
+debian/tmp/usr/share/apps/kconf_update/kaudiocreator-meta.upd
+debian/tmp/usr/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+debian/tmp/usr/share/apps/konqueror/servicemenus/audiocd_extract.desktop
+debian/tmp/usr/share/config.kcfg/kaudiocreator.kcfg
+debian/tmp/usr/share/config.kcfg/kaudiocreator_encoders.kcfg
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kaudiocreator.png
+
+debian/icons/kaudiocreator.xpm		/usr/share/pixmaps
+debian/icons/kaudiocreator-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/kmid.README.Debian
+++ kdemultimedia-3.5.0/debian/kmid.README.Debian
@@ -0,0 +1,7 @@
+kmid for Debian
+---------------
+
+kmid can be used with a hardware synth or with timidity by running 
+"timidity -iA -Os".
+
+ -- Christopher L Cheney <ccheney@debian.org>, Sun, 21 Dec 2003 22:00:00 -0600
--- kdemultimedia-3.5.0.orig/debian/libarts1-audiofile.lintian
+++ kdemultimedia-3.5.0/debian/libarts1-audiofile.lintian
@@ -0,0 +1 @@
+libarts1-audiofile: no-shlibs-control-file usr/lib/libaudiofilearts.so
--- kdemultimedia-3.5.0.orig/debian/libarts1-mpeglib.install
+++ kdemultimedia-3.5.0/debian/libarts1-mpeglib.install
@@ -0,0 +1,13 @@
+debian/tmp/usr/bin/mpeglibartsplay
+debian/tmp/usr/lib/libarts_mpeglib-0.3.0.so.0
+debian/tmp/usr/lib/libarts_mpeglib-0.3.0.so.0.0.3
+debian/tmp/usr/lib/libarts_mpeglib.la
+debian/tmp/usr/lib/libarts_splay.la
+debian/tmp/usr/lib/libarts_splay.so.0
+debian/tmp/usr/lib/libarts_splay.so.0.0.0
+debian/tmp/usr/lib/mcop/CDDAPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/MP3PlayObject.mcopclass
+debian/tmp/usr/lib/mcop/NULLPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/OGGPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/SplayPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/WAVPlayObject.mcopclass
--- kdemultimedia-3.5.0.orig/debian/kmix.lintian
+++ kdemultimedia-3.5.0/debian/kmix.lintian
@@ -0,0 +1,4 @@
+kmix: no-shlibs-control-file usr/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file usr/lib/libkdeinit_kmix.so
+kmix: postinst-must-call-ldconfig usr/lib/libkdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig usr/lib/libkdeinit_kmixctrl.so
--- kdemultimedia-3.5.0.orig/debian/kmix.menu
+++ kdemultimedia-3.5.0/debian/kmix.menu
@@ -0,0 +1,11 @@
+?package(kmix):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="KMix"\
+	icon32x32="/usr/share/pixmaps/kmix.xpm"\
+	icon16x16="/usr/share/pixmaps/kmix-16.xpm"\
+	command="/usr/bin/kmix"
+
+# Icon 32x32 kmix/pics/cr32-app-kmix.png kmix.xpm
+# Icon 16x16 kmix/pics/cr16-app-kmix.png kmix-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kmix.install
+++ kdemultimedia-3.5.0/debian/kmix.install
@@ -0,0 +1,53 @@
+debian/tmp/usr/bin/kmix
+debian/tmp/usr/bin/kmixctrl
+debian/tmp/usr/lib/kde3/kmix.la
+debian/tmp/usr/lib/kde3/kmix.so
+debian/tmp/usr/lib/kde3/kmix_panelapplet.la
+debian/tmp/usr/lib/kde3/kmix_panelapplet.so
+debian/tmp/usr/lib/kde3/kmixctrl.la
+debian/tmp/usr/lib/kde3/kmixctrl.so
+debian/tmp/usr/lib/libkdeinit_kmix.so
+debian/tmp/usr/lib/libkdeinit_kmixctrl.so
+debian/tmp/usr/share/applications/kde/kmix.desktop
+debian/tmp/usr/share/apps/kicker/applets/kmixapplet.desktop
+debian/tmp/usr/share/apps/kmix/kmixui.rc
+debian/tmp/usr/share/apps/kmix/pics/Listener.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontLeft.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontRight.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerRearLeft.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerRearRight.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked_error.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked_mute.png
+debian/tmp/usr/share/apps/kmix/pics/mix_ac97.png
+debian/tmp/usr/share/apps/kmix/pics/mix_audio.png
+debian/tmp/usr/share/apps/kmix/pics/mix_bass.png
+debian/tmp/usr/share/apps/kmix/pics/mix_cd.png
+debian/tmp/usr/share/apps/kmix/pics/mix_digital.png
+debian/tmp/usr/share/apps/kmix/pics/mix_ext.png
+debian/tmp/usr/share/apps/kmix/pics/mix_headphone.png
+debian/tmp/usr/share/apps/kmix/pics/mix_microphone.png
+debian/tmp/usr/share/apps/kmix/pics/mix_midi.png
+debian/tmp/usr/share/apps/kmix/pics/mix_recmon.png
+debian/tmp/usr/share/apps/kmix/pics/mix_record.png
+debian/tmp/usr/share/apps/kmix/pics/mix_surround.png
+debian/tmp/usr/share/apps/kmix/pics/mix_treble.png
+debian/tmp/usr/share/apps/kmix/pics/mix_unknown.png
+debian/tmp/usr/share/apps/kmix/pics/mix_video.png
+debian/tmp/usr/share/apps/kmix/pics/mix_volume.png
+debian/tmp/usr/share/autostart/restore_kmix_volumes.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-channel-record.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-window.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/usr/share/services/kmixctrl_restore.desktop
+
+debian/icons/kmix.xpm		/usr/share/pixmaps
+debian/icons/kmix-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.kmix
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.kmix
@@ -0,0 +1,12 @@
+Document: kdemultimedia-doc-html-kmix
+Title: KMix Handbook
+Author: Matt Johnson, Christian Esken, Helio Chissini de Castro,
+ Stefan Schimanski, Lauri Watts
+Abstract: KMix is an application to allow you to change the volume of
+ your sound card.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmix/index.html
+Files: /usr/share/doc/kde/HTML/en/kmix/*.html
+
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.artsbuilder
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.artsbuilder
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-artsbuilder
+Title: Artsbuilder Handbook
+Author: Stefan Westerfeld, Jeff Tranter 
+Abstract: This handbook describes aRts, the Analog Real-time Synthesizer.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/artsbuilder/index.html
+Files: /usr/share/doc/kde/HTML/en/artsbuilder/*.html
+
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.kaboodle
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.kaboodle
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-kaboodle
+Title: Kaboodle Handbook
+Author: The KDE team.
+Abstract: Kaboodle is a one file quick media player for KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kaboodle/index.html
+Files: /usr/share/doc/kde/HTML/en/kaboodle/*.html
+
--- kdemultimedia-3.5.0.orig/debian/artsbuilder.install
+++ kdemultimedia-3.5.0/debian/artsbuilder.install
@@ -0,0 +1,351 @@
+debian/tmp/usr/bin/artsbuilder
+debian/tmp/usr/bin/artscontrol
+debian/tmp/usr/bin/midisend
+debian/tmp/usr/lib/libartsbuilder.la
+debian/tmp/usr/lib/libartsbuilder.so.0
+debian/tmp/usr/lib/libartsbuilder.so.0.0.0
+debian/tmp/usr/lib/libartscontrolapplet.la
+debian/tmp/usr/lib/libartscontrolapplet.so.1
+debian/tmp/usr/lib/libartscontrolapplet.so.1.0.0
+debian/tmp/usr/lib/libartscontrolsupport.la
+debian/tmp/usr/lib/libartscontrolsupport.so.1
+debian/tmp/usr/lib/libartscontrolsupport.so.1.0.0
+debian/tmp/usr/lib/libartsgui_idl.so.0
+debian/tmp/usr/lib/libartsgui_idl.so.0.0.0
+debian/tmp/usr/lib/libartsgui_kde.la
+debian/tmp/usr/lib/libartsgui_kde.so.0
+debian/tmp/usr/lib/libartsgui_kde.so.0.0.0
+debian/tmp/usr/lib/libartsgui.la
+debian/tmp/usr/lib/libartsgui.so.0
+debian/tmp/usr/lib/libartsgui.so.0.0.0
+debian/tmp/usr/lib/libartsmidi_idl.so.0
+debian/tmp/usr/lib/libartsmidi_idl.so.0.0.0
+debian/tmp/usr/lib/libartsmidi.la
+debian/tmp/usr/lib/libartsmidi.so.0
+debian/tmp/usr/lib/libartsmidi.so.0.0.0
+debian/tmp/usr/lib/libartsmodulescommon.la
+debian/tmp/usr/lib/libartsmodulescommon.so.0
+debian/tmp/usr/lib/libartsmodulescommon.so.0.0.0
+debian/tmp/usr/lib/libartsmoduleseffects.la
+debian/tmp/usr/lib/libartsmoduleseffects.so.0
+debian/tmp/usr/lib/libartsmoduleseffects.so.0.0.0
+debian/tmp/usr/lib/libartsmodulesmixers.la
+debian/tmp/usr/lib/libartsmodulesmixers.so.0
+debian/tmp/usr/lib/libartsmodulesmixers.so.0.0.0
+debian/tmp/usr/lib/libartsmodules.so.0
+debian/tmp/usr/lib/libartsmodules.so.0.0.0
+debian/tmp/usr/lib/libartsmodulessynth.la
+debian/tmp/usr/lib/libartsmodulessynth.so.0
+debian/tmp/usr/lib/libartsmodulessynth.so.0.0.0
+debian/tmp/usr/lib/mcop/Arts/ArtsBuilderLoader.mcopclass
+debian/tmp/usr/lib/mcop/artsbuilder.mcopclass
+debian/tmp/usr/lib/mcop/artsbuilder.mcoptype
+debian/tmp/usr/lib/mcop/Arts/Button.mcopclass
+debian/tmp/usr/lib/mcop/Arts/EffectRackGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Effect_WAVECAPTURE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/Container.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/EffectRackItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/InstrumentItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/MixerItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Fader.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FreeverbGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/GenericGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/GraphLine.mcopclass
+debian/tmp/usr/lib/mcop/artsgui.mcopclass
+debian/tmp/usr/lib/mcop/artsgui.mcoptype
+debian/tmp/usr/lib/mcop/Arts/HBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Label.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LayoutBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LevelMeter.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LineEdit.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LittleStereoMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LocalFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MidiManager.mcopclass
+debian/tmp/usr/lib/mcop/artsmidi.mcopclass
+debian/tmp/usr/lib/mcop/artsmidi.mcoptype
+debian/tmp/usr/lib/mcop/Arts/MixerGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulescommon.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulescommon.mcoptype
+debian/tmp/usr/lib/mcop/artsmoduleseffects.mcopclass
+debian/tmp/usr/lib/mcop/artsmoduleseffects.mcoptype
+debian/tmp/usr/lib/mcop/artsmodules.mcopclass
+debian/tmp/usr/lib/mcop/artsmodules.mcoptype
+debian/tmp/usr/lib/mcop/artsmodulesmixers.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulesmixers.mcoptype
+debian/tmp/usr/lib/mcop/artsmodulessynth.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulessynth.mcoptype
+debian/tmp/usr/lib/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MonoSimpleMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MonoToStereo.mcopclass
+debian/tmp/usr/lib/mcop/Arts/PopupBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Poti.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SimpleMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SpinBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoBalanceGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoBalance.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoCompressorGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoToMono.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoVolumeControlGui.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StructureBuilder.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StructureDesc.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_AUTOPANNER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_CDELAY.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_COMPRESSOR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DATA.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DEBUG.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DELAY.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DIV.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FM_SOURCE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FREEVERB.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FX_CFLANGER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MOOG_VCF.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_NIL.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_NOISE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_OSC.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PLAY_PAT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PSCALE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_RC.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SEQUENCE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_TREMOLO.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_XFADE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/VBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Widget.mcopclass
+debian/tmp/usr/share/applications/kde/artsbuilder.desktop
+debian/tmp/usr/share/applications/kde/artscontrol.desktop
+debian/tmp/usr/share/apps/artsbuilder/artsbuilderui.rc
+debian/tmp/usr/share/apps/artsbuilder/examples/example_adsr.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_atan_saturate.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_autopanner.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_brickwall.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_bus.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_capture_wav.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_cdelay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_cflanger.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_data.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_delay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_dtmf1.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_equalizer.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_fm.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_freeverb.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_moog.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_multi_add.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_noise.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pitchshift.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_play_wave.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pscale.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pulse.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_rc.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_record.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_sequence.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_shelve_cutoff.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_sine.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_softsaw.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_stereobeep.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_tremolo.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_xfade.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_arts_all.arts-map
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_chirpdrum.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_deepdrum.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_full_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_hihat.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_neworgan.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_nokind.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_organ2.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_sin.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_slide1.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_slide.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/README
+debian/tmp/usr/share/apps/artsbuilder/examples/template_Empty_Structure.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/template_Instrument.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_delay_alone.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_delay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_flanger_alone.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_flexible_slide.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_flexible_slide_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_fm_horn.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_eq.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_eqfx.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_simple.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/template_Instrument_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/template_Mixer_Element.arts
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ADD.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_AMAN_PLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_DEBUG.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_DIV.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MOOG_VCF.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MULTI_ADD.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MUL.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PSCALE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_RC.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SEQUENCE_FREQ.png
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SEQUENCE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SHELVE_CUTOFF.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_XFADE.xpm
+debian/tmp/usr/share/apps/artscontrol/artscontrol.rc
+debian/tmp/usr/share/apps/artscontrol/artsmidimanagerview.rc
+debian/tmp/usr/share/apps/kicker/applets/artscontrolapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/apis.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/arts-structure.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/common
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/detail.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/faq.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/future.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/glossary.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/gui.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/helping.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema1.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema2.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema3.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema4.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DIV.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE_FREQ.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/mcop.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/midi.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/midiintro.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/modules.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/porting.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/references.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/tools.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+debian/tmp/usr/share/icons/hicolor/128x128/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/artsbuilder.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/artsbuilder.svgz
+debian/tmp/usr/share/icons/hicolor/scalable/apps/artscontrol.svgz
+debian/tmp/usr/share/mimelnk/application/x-artsbuilder.desktop
+
+debian/icons/artsbuilder.xpm		/usr/share/pixmaps
+debian/icons/artscontrol.xpm		/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/krec.manpages
+++ kdemultimedia-3.5.0/debian/krec.manpages
@@ -0,0 +1 @@
+debian/man/krec.1
--- kdemultimedia-3.5.0.orig/debian/artsbuilder.menu
+++ kdemultimedia-3.5.0/debian/artsbuilder.menu
@@ -0,0 +1,18 @@
+?package(artsbuilder):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="aRts Builder"\
+	icon="/usr/share/pixmaps/artsbuilder.xpm"\
+	command="/usr/bin/artsbuilder"
+
+?package(artsbuilder):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="aRts Control"\
+	icon="/usr/share/pixmaps/artscontrol.xpm"\
+	command="/usr/bin/artscontrol"
+	
+# Icon 16x16 arts/builder/pics/cr16-app-artsbuilder.png artsbuilder.xpm
+# Icon 16x16 arts/builder/pics/cr16-app-artscontrol.png artscontrol.xpm
--- kdemultimedia-3.5.0.orig/debian/compat
+++ kdemultimedia-3.5.0/debian/compat
@@ -0,0 +1 @@
+4
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-kio-plugins.install
+++ kdemultimedia-3.5.0/debian/kdemultimedia-kio-plugins.install
@@ -0,0 +1,21 @@
+debian/tmp/usr/lib/kde3/kcm_audiocd.la
+debian/tmp/usr/lib/kde3/kcm_audiocd.so
+debian/tmp/usr/lib/kde3/kio_audiocd.la
+debian/tmp/usr/lib/kde3/kio_audiocd.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_flac.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_flac.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_lame.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_lame.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_vorbis.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_vorbis.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_wav.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_wav.so
+debian/tmp/usr/lib/libaudiocdplugins.so.1
+debian/tmp/usr/lib/libaudiocdplugins.so.1.0.0
+debian/tmp/usr/share/applications/kde/audiocd.desktop
+debian/tmp/usr/share/apps/kconf_update/audiocd.upd
+debian/tmp/usr/share/apps/kconf_update/upgrade-metadata.sh
+debian/tmp/usr/share/config.kcfg/audiocd_lame_encoder.kcfg
+debian/tmp/usr/share/config.kcfg/audiocd_vorbis_encoder.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kioslave/audiocd.docbook
+debian/tmp/usr/share/services/audiocd.protocol
--- kdemultimedia-3.5.0.orig/debian/kaboodle.menu
+++ kdemultimedia-3.5.0/debian/kaboodle.menu
@@ -0,0 +1,11 @@
+?package(kaboodle):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="Kaboodle"\
+	icon32x32="/usr/share/pixmaps/kaboodle.xpm"\
+	icon16x16="/usr/share/pixmaps/kaboodle-16.xpm"\
+	command="/usr/bin/kaboodle"
+
+# Icon 32x32 kaboodle/pics/cr32-app-kaboodle.png kaboodle.xpm
+# Icon 16x16 kaboodle/pics/cr16-app-kaboodle.png kaboodle-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kaboodle.manpages
+++ kdemultimedia-3.5.0/debian/kaboodle.manpages
@@ -0,0 +1 @@
+debian/man/kaboodle.1
--- kdemultimedia-3.5.0.orig/debian/kaboodle.install
+++ kdemultimedia-3.5.0/debian/kaboodle.install
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/kaboodle
+debian/tmp/usr/lib/kde3/libkaboodlepart.la
+debian/tmp/usr/lib/kde3/libkaboodlepart.so
+debian/tmp/usr/share/applications/kde/kaboodle.desktop
+debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
+debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
+debian/tmp/usr/share/apps/kaboodle/kaboodlepartui.rc
+debian/tmp/usr/share/apps/kaboodle/kaboodleui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/common
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/usr/share/services/kaboodle_component.desktop
+debian/tmp/usr/share/services/kaboodleengine.desktop
+
+debian/icons/kaboodle.xpm		/usr/share/pixmaps
+debian/icons/kaboodle-16.xpm		/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/libarts1-audiofile.install
+++ kdemultimedia-3.5.0/debian/libarts1-audiofile.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/libaudiofilearts.la
+debian/tmp/usr/lib/libaudiofilearts.so
+debian/tmp/usr/lib/mcop/Arts/audiofilePlayObject.mcopclass
+debian/tmp/usr/lib/mcop/audiofilearts.mcopclass
+debian/tmp/usr/lib/mcop/audiofilearts.mcoptype
--- kdemultimedia-3.5.0.orig/debian/kaudiocreator.manpages
+++ kdemultimedia-3.5.0/debian/kaudiocreator.manpages
@@ -0,0 +1 @@
+debian/man/kaudiocreator.1
--- kdemultimedia-3.5.0.orig/debian/juk.menu
+++ kdemultimedia-3.5.0/debian/juk.menu
@@ -0,0 +1,11 @@
+?package(juk):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="JuK"\
+	icon32x32="/usr/share/pixmaps/juk.xpm"\
+	icon16x16="/usr/share/pixmaps/juk-16.xpm"\
+	command="/usr/bin/juk"
+
+# Icon 32x32 juk/cr32-app-juk.png juk.xpm
+# Icon 16x16 juk/cr16-app-juk.png juk-16.xpm
--- kdemultimedia-3.5.0.orig/debian/noatun.lintian
+++ kdemultimedia-3.5.0/debian/noatun.lintian
@@ -0,0 +1,4 @@
+noatun: shlib-missing-in-control-file libwinskinvis.so usr/lib/libwinskinvis.so
+noatun: shlib-missing-in-control-file libartseffects.so usr/lib/libartseffects.so
+noatun: shlib-missing-in-control-file libnoatunarts.so usr/lib/libnoatunarts.so
+noatun: shlib-missing-in-control-file libkdeinit_noatun.so usr/lib/libkdeinit_noatun.so
--- kdemultimedia-3.5.0.orig/debian/cdbs/debian-qt-kde.mk
+++ kdemultimedia-3.5.0/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,99 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
--- kdemultimedia-3.5.0.orig/debian/cdbs/versions.pl
+++ kdemultimedia-3.5.0/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
--- kdemultimedia-3.5.0.orig/debian/cdbs/kde.mk
+++ kdemultimedia-3.5.0/debian/cdbs/kde.mk
@@ -0,0 +1,93 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+	rm -rf po
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
--- kdemultimedia-3.5.0.orig/debian/cdbs/simple-patchsys.mk
+++ kdemultimedia-3.5.0/debian/cdbs/simple-patchsys.mk
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+#  Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+  $$lsdiff -H $(DEB_PATCHES) \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+	  rm -f $$dir/*.log ; \
+	done
+
+# The patch subsystem 
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+	$(MAKE) -f debian/rules reverse-config
+	@echo "patches: $(DEB_PATCHES)"
+	@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+	  if [ "$@" = "reverse-patches" ]; then \
+	    if [ ! -e debian/stamp-patched ]; then \
+	      echo "Not reversing not applied patches."; \
+	      exit 0; \
+	    fi; \
+	    reverse="-R"; \
+	    for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+	    patches="$$reversepatches"; \
+	  fi; \
+	  for patch in $$patches; do \
+          case $$patch in \
+            *.gz) cat=zcat ;; \
+            *.bz2) cat=bzcat ;; \
+            *.uu) cat="uudecode -o -" ;; \
+            *) cat=cat ;; \
+          esac; \
+	  level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+	  reverse=""; \
+	  if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+	  success=""; \
+	  if [ -z "$$level" ]; then \
+	    echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+	    for level in 0 1 2; do \
+	      if test -z "$$success"; then \
+	        echo -n "$$level..."; \
+		if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+		  logfile="/dev/null" ; \
+		else \
+		  logfile="$$patch.level-$$level.log" ; \
+		fi ; \
+	        if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+	          if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+	            success=yes; \
+	            touch debian/stamp-patch-$$(basename $$patch); \
+	            echo "success."; \
+                  fi; \
+	        fi; \
+	      fi; \
+            done; \
+	    if test -z "$$success"; then \
+	      if test -z "$$reverse"; then \
+	        echo "failure."; \
+	        exit 1; \
+	       else \
+	         echo "failure (ignored)."; \
+               fi \
+	    fi; \
+	  else \
+	    echo -n "Trying patch $$patch at level $$level..."; \
+	        echo -n "$$level..."; \
+	    if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+	      logfile="/dev/null" ; \
+	    else \
+	      logfile="$$patch.log" ; \
+	    fi ; \
+	    if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+              touch debian/stamp-patch-$$(basename $$patch); \
+	      echo "success."; \
+	    else \
+	      echo "failure:"; \
+	      cat $$logfile; \
+	      if test -z "$$reverse"; then exit 1; fi; \
+            fi; \
+	  fi; \
+	done
+	if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+	elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+	fi
+	# eliminate update-config when reversing patches - Bug ##299010
+	if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-dev.install
+++ kdemultimedia-3.5.0/debian/kdemultimedia-dev.install
@@ -0,0 +1,174 @@
+debian/tmp/usr/include/kde/arts/artsbuilder.h
+debian/tmp/usr/include/kde/arts/artsbuilder.idl
+debian/tmp/usr/include/kde/arts/artsgui.h
+debian/tmp/usr/include/kde/arts/artsgui.idl
+debian/tmp/usr/include/kde/arts/artsmidi.h
+debian/tmp/usr/include/kde/arts/artsmidi.idl
+debian/tmp/usr/include/kde/arts/artsmodules.h
+debian/tmp/usr/include/kde/arts/artsmodules.idl
+debian/tmp/usr/include/kde/arts/artsmodulescommon.h
+debian/tmp/usr/include/kde/arts/artsmodulescommon.idl
+debian/tmp/usr/include/kde/arts/artsmoduleseffects.h
+debian/tmp/usr/include/kde/arts/artsmoduleseffects.idl
+debian/tmp/usr/include/kde/arts/artsmodulesmixers.h
+debian/tmp/usr/include/kde/arts/artsmodulesmixers.idl
+debian/tmp/usr/include/kde/arts/artsmodulessynth.h
+debian/tmp/usr/include/kde/arts/artsmodulessynth.idl
+debian/tmp/usr/include/kde/arts/kartswidget.h
+debian/tmp/usr/include/kde/arts/kframe_impl.h
+debian/tmp/usr/include/kde/arts/klayoutbox_impl.h
+debian/tmp/usr/include/kde/arts/kwidget_impl.h
+debian/tmp/usr/include/kde/arts/kwidgetrepo.h
+debian/tmp/usr/include/kde/audiocdencoder.h
+debian/tmp/usr/include/kde/cmodule.h
+debian/tmp/usr/include/kde/effectview.h
+debian/tmp/usr/include/kde/equalizerview.h
+debian/tmp/usr/include/kde/ksaver.h
+debian/tmp/usr/include/kde/libkcddb/cache.h
+debian/tmp/usr/include/kde/libkcddb/cddb.h
+debian/tmp/usr/include/kde/libkcddb/cdinfo.h
+debian/tmp/usr/include/kde/libkcddb/client.h
+debian/tmp/usr/include/kde/libkcddb/config.h
+debian/tmp/usr/include/kde/libkcddb/configbase.h
+debian/tmp/usr/include/kde/mimetypetree.h
+debian/tmp/usr/include/kde/mpeglib/decoder/cddaPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/command.h
+debian/tmp/usr/include/kde/mpeglib/decoder/commandPipe.h
+debian/tmp/usr/include/kde/mpeglib/decoder/decoderPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/mpegPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/mpgPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/nukePlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/splayPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/tplayPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/yuvPlugin.h
+debian/tmp/usr/include/kde/mpeglib/frame/IOFrameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/audioFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/audioFrameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/floatFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/frame.h
+debian/tmp/usr/include/kde/mpeglib/frame/frameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/framer.h
+debian/tmp/usr/include/kde/mpeglib/frame/pcmFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/rawDataBuffer.h
+debian/tmp/usr/include/kde/mpeglib/frame/rawFrame.h
+debian/tmp/usr/include/kde/mpeglib/input/bufferInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/cddaInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/cdromInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/fileInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/httpInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/inputDetector.h
+debian/tmp/usr/include/kde/mpeglib/input/inputPlugin.h
+debian/tmp/usr/include/kde/mpeglib/input/inputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/threadSafeInputStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/usr/include/kde/mpeglib/output/artsOutputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/audioTime.h
+debian/tmp/usr/include/kde/mpeglib/output/avSyncer.h
+debian/tmp/usr/include/kde/mpeglib/output/dspX11OutputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/outPlugin.h
+debian/tmp/usr/include/kde/mpeglib/output/outputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/pluginInfo.h
+debian/tmp/usr/include/kde/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/usr/include/kde/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/usr/include/kde/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/usr/include/kde/mpeglib/splay/splayDecoder.h
+debian/tmp/usr/include/kde/mpeglib/util/abstract/abs_thread.h
+debian/tmp/usr/include/kde/mpeglib/util/abstract/threadQueue.h
+debian/tmp/usr/include/kde/mpeglib/util/dynBuffer.h
+debian/tmp/usr/include/kde/mpeglib/util/file/fileAccess.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mm_accel.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mmx.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/usr/include/kde/mpeglib/util/render/pictureArray.h
+debian/tmp/usr/include/kde/mpeglib/util/render/yuvPicture.h
+debian/tmp/usr/include/kde/mpeglib/util/syncClock.h
+debian/tmp/usr/include/kde/mpeglib/util/timeStamp.h
+debian/tmp/usr/include/kde/mpeglib/util/timeStampArray.h
+debian/tmp/usr/include/kde/mpeglib/util/timeWrapper.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/usr/include/kde/noatun/app.h
+debian/tmp/usr/include/kde/noatun/controls.h
+debian/tmp/usr/include/kde/noatun/conversion.h
+debian/tmp/usr/include/kde/noatun/downloader.h
+debian/tmp/usr/include/kde/noatun/effects.h
+debian/tmp/usr/include/kde/noatun/engine.h
+debian/tmp/usr/include/kde/noatun/equalizer.h
+debian/tmp/usr/include/kde/noatun/noatunarts.h
+debian/tmp/usr/include/kde/noatun/player.h
+debian/tmp/usr/include/kde/noatun/playlist.h
+debian/tmp/usr/include/kde/noatun/playlistsaver.h
+debian/tmp/usr/include/kde/noatun/plugin.h
+debian/tmp/usr/include/kde/noatun/pluginloader.h
+debian/tmp/usr/include/kde/noatun/pref.h
+debian/tmp/usr/include/kde/noatun/scrollinglabel.h
+debian/tmp/usr/include/kde/noatun/stdaction.h
+debian/tmp/usr/include/kde/noatun/stereobuttonaction.h
+debian/tmp/usr/include/kde/noatun/tags.h
+debian/tmp/usr/include/kde/noatun/vequalizer.h
+debian/tmp/usr/include/kde/noatun/video.h
+debian/tmp/usr/include/kde/noatun/winskinvis.h
+debian/tmp/usr/include/kde/plugin_deps.h
+debian/tmp/usr/lib/libarts_mpeglib.so
+debian/tmp/usr/lib/libarts_splay.so
+debian/tmp/usr/lib/libartsbuilder.so
+debian/tmp/usr/lib/libartscontrolapplet.so
+debian/tmp/usr/lib/libartscontrolsupport.so
+debian/tmp/usr/lib/libartsgui.so
+debian/tmp/usr/lib/libartsgui_idl.la
+debian/tmp/usr/lib/libartsgui_idl.so
+debian/tmp/usr/lib/libartsgui_kde.so
+debian/tmp/usr/lib/libartsmidi.so
+debian/tmp/usr/lib/libartsmidi_idl.la
+debian/tmp/usr/lib/libartsmidi_idl.so
+debian/tmp/usr/lib/libartsmodules.la
+debian/tmp/usr/lib/libartsmodules.so
+debian/tmp/usr/lib/libartsmodulescommon.so
+debian/tmp/usr/lib/libartsmoduleseffects.so
+debian/tmp/usr/lib/libartsmodulesmixers.so
+debian/tmp/usr/lib/libartsmodulessynth.so
+debian/tmp/usr/lib/libaudiocdplugins.la
+debian/tmp/usr/lib/libaudiocdplugins.so
+debian/tmp/usr/lib/libkcddb.la
+debian/tmp/usr/lib/libkcddb.so
+debian/tmp/usr/lib/libkdeinit_kmix.la
+debian/tmp/usr/lib/libkdeinit_kmixctrl.la
+debian/tmp/usr/lib/libkdeinit_krec.la
+debian/tmp/usr/lib/libkdeinit_noatun.la
+debian/tmp/usr/lib/libkmidlib.la
+debian/tmp/usr/lib/libkmidlib.so
+debian/tmp/usr/lib/libmpeg.la
+debian/tmp/usr/lib/libmpeg.so
+debian/tmp/usr/lib/libnoatun.la
+debian/tmp/usr/lib/libnoatun.so
+debian/tmp/usr/lib/libnoatuncontrols.la
+debian/tmp/usr/lib/libnoatuncontrols.so
+debian/tmp/usr/lib/libnoatuntags.la
+debian/tmp/usr/lib/libnoatuntags.so
+debian/tmp/usr/lib/libyafcore.la
+debian/tmp/usr/lib/libyafcore.so
+debian/tmp/usr/lib/libyafxplayer.la
+debian/tmp/usr/lib/libyafxplayer.so
--- kdemultimedia-3.5.0.orig/debian/kmix.manpages
+++ kdemultimedia-3.5.0/debian/kmix.manpages
@@ -0,0 +1,2 @@
+debian/man/kmix.1
+debian/man/kmixctrl.1
--- kdemultimedia-3.5.0.orig/debian/noatun.menu
+++ kdemultimedia-3.5.0/debian/noatun.menu
@@ -0,0 +1,11 @@
+?package(noatun):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="Noatun"\
+	icon32x32="/usr/share/pixmaps/noatun.xpm"\
+	icon16x16="/usr/share/pixmaps/noatun-16.xpm"\
+	command="/usr/bin/noatun"
+
+# Icon 32x32 noatun/cr32-app-noatun.png noatun.xpm
+# Icon 16x16 noatun/cr16-app-noatun.png noatun-16.xpm
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-doc-html.doc-base.noatun
+++ kdemultimedia-3.5.0/debian/kdemultimedia-doc-html.doc-base.noatun
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-noatun
+Title: NoAtun Handbook
+Author: Charles Samuels
+Abstract: NoAtun is a fully-featured plugin-based media player for KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/noatun/index.html
+Files: /usr/share/doc/kde/HTML/en/noatun/*.html
+
--- kdemultimedia-3.5.0.orig/debian/copyright
+++ kdemultimedia-3.5.0/debian/copyright
@@ -0,0 +1,508 @@
+This package was debianized by Christopher L Cheney <ccheney@debian.org> on
+Tue, 16 Apr 2002 22:00:00 -0500.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors: Stephan Kulow <coolo@kde.org> and many others.
+
+License:
+
+All programs are either under the BSD, GPL or LGPL licenses. On Debian
+systems, the complete text of the BSD, GPL and LGPL licenses can be found
+in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
+/usr/share/common-licenses/LGPL files.
+
+
+aktion, arts/builder, arts/runtime, arts/tools,
+kfile-plugins, kmid, kmidi, koncd, kscd
+-----------------------------------------------
+GPL
+
+arts/gui, arts/midi, arts/modules,
+kmix, mpeglib, mpeglib_artsplug
+----------------------------------
+LGPL
+
+audiofile_artsplugin, kaboodle, noatun
+--------------------------------------
+various bsd derivative licenses - see below
+
+
+audiofile_artsplugin
+--------------------
+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
+THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the author(s) shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the author(s).
+---
+
+kaboodle
+--------
+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
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIAB\ILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
+
+noatun
+------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------
+
+DocBook Documentation:
+
+  Permission is granted to copy, distribute and/or modify this
+  document under the terms of the GNU Free Documentation License,
+  Version 1.1 or any later version published by the Free Software
+  Foundation; with no Invariant Sections, with no Front-Cover Texts,
+  and with no Back-Cover Texts.
+
+  A copy of the GNU Free Documentation License (Version 1.2) is
+  included below.
+
+
+                  GNU Free Documentation License
+                    Version 1.2, November 2002
+
+
+   Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+       51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+  The purpose of this License is to make a manual, textbook, or other
+  functional and useful document "free" in the sense of freedom: to
+  assure everyone the effective freedom to copy and redistribute it,
+  with or without modifying it, either commercially or noncommercially.
+  Secondarily, this License preserves for the author and publisher a way
+  to get credit for their work, while not being considered responsible
+  for modifications made by others.
+
+  This License is a kind of "copyleft", which means that derivative
+  works of the document must themselves be free in the same sense.  It
+  complements the GNU General Public License, which is a copyleft
+  license designed for free software.
+
+  We have designed this License in order to use it for manuals for free
+  software, because free software needs free documentation: a free
+  program should come with manuals providing the same freedoms that the
+  software does.  But this License is not limited to software manuals;
+  it can be used for any textual work, regardless of subject matter or
+  whether it is published as a printed book.  We recommend this License
+  principally for works whose purpose is instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+  This License applies to any manual or other work, in any medium, that
+  contains a notice placed by the copyright holder saying it can be
+  distributed under the terms of this License.  Such a notice grants a
+  world-wide, royalty-free license, unlimited in duration, to use that
+  work under the conditions stated herein.  The "Document", below,
+  refers to any such manual or work.  Any member of the public is a
+  licensee, and is addressed as "you".  You accept the license if you
+  copy, modify or distribute the work in a way requiring permission
+  under copyright law.
+
+  A "Modified Version" of the Document means any work containing the
+  Document or a portion of it, either copied verbatim, or with
+  modifications and/or translated into another language.
+
+  A "Secondary Section" is a named appendix or a front-matter section of
+  the Document that deals exclusively with the relationship of the
+  publishers or authors of the Document to the Document's overall subject
+  (or to related matters) and contains nothing that could fall directly
+  within that overall subject.  (Thus, if the Document is in part a
+  textbook of mathematics, a Secondary Section may not explain any
+  mathematics.)  The relationship could be a matter of historical
+  connection with the subject or with related matters, or of legal,
+  commercial, philosophical, ethical or political position regarding
+  them.
+
+  The "Invariant Sections" are certain Secondary Sections whose titles
+  are designated, as being those of Invariant Sections, in the notice
+  that says that the Document is released under this License.  If a
+  section does not fit the above definition of Secondary then it is not
+  allowed to be designated as Invariant.  The Document may contain zero
+  Invariant Sections.  If the Document does not identify any Invariant
+  Sections then there are none.
+
+  The "Cover Texts" are certain short passages of text that are listed,
+  as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+  the Document is released under this License.  A Front-Cover Text may
+  be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+  A "Transparent" copy of the Document means a machine-readable copy,
+  represented in a format whose specification is available to the
+  general public, that is suitable for revising the document
+  straightforwardly with generic text editors or (for images composed of
+  pixels) generic paint programs or (for drawings) some widely available
+  drawing editor, and that is suitable for input to text formatters or
+  for automatic translation to a variety of formats suitable for input
+  to text formatters.  A copy made in an otherwise Transparent file
+  format whose markup, or absence of markup, has been arranged to thwart
+  or discourage subsequent modification by readers is not Transparent.
+  An image format is not Transparent if used for any substantial amount
+  of text.  A copy that is not "Transparent" is called "Opaque".
+
+  Examples of suitable formats for Transparent copies include plain
+  ASCII without markup, Texinfo input format, LaTeX input format, SGML
+  or XML using a publicly available DTD, and standard-conforming simple
+  HTML, PostScript or PDF designed for human modification.  Examples of
+  transparent image formats include PNG, XCF and JPG.  Opaque formats
+  include proprietary formats that can be read and edited only by
+  proprietary word processors, SGML or XML for which the DTD and/or
+  processing tools are not generally available, and the
+  machine-generated HTML, PostScript or PDF produced by some word
+  processors for output purposes only.
+
+  The "Title Page" means, for a printed book, the title page itself,
+  plus such following pages as are needed to hold, legibly, the material
+  this License requires to appear in the title page.  For works in
+  formats which do not have any title page as such, "Title Page" means
+  the text near the most prominent appearance of the work's title,
+  preceding the beginning of the body of the text.
+
+  A section "Entitled XYZ" means a named subunit of the Document whose
+  title either is precisely XYZ or contains XYZ in parentheses following
+  text that translates XYZ in another language.  (Here XYZ stands for a
+  specific section name mentioned below, such as "Acknowledgements",
+  "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+  of such a section when you modify the Document means that it remains a
+  section "Entitled XYZ" according to this definition.
+
+  The Document may include Warranty Disclaimers next to the notice which
+  states that this License applies to the Document.  These Warranty
+  Disclaimers are considered to be included by reference in this
+  License, but only as regards disclaiming warranties: any other
+  implication that these Warranty Disclaimers may have is void and has
+  no effect on the meaning of this License.
+
+
+  2. VERBATIM COPYING
+
+  You may copy and distribute the Document in any medium, either
+  commercially or noncommercially, provided that this License, the
+  copyright notices, and the license notice saying this License applies
+  to the Document are reproduced in all copies, and that you add no other
+  conditions whatsoever to those of this License.  You may not use
+  technical measures to obstruct or control the reading or further
+  copying of the copies you make or distribute.  However, you may accept
+  compensation in exchange for copies.  If you distribute a large enough
+  number of copies you must also follow the conditions in section 3.
+
+  You may also lend copies, under the same conditions stated above, and
+  you may publicly display copies.
+
+
+  3. COPYING IN QUANTITY
+
+  If you publish printed copies (or copies in media that commonly have
+  printed covers) of the Document, numbering more than 100, and the
+  Document's license notice requires Cover Texts, you must enclose the
+  copies in covers that carry, clearly and legibly, all these Cover
+  Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+  the back cover.  Both covers must also clearly and legibly identify
+  you as the publisher of these copies.  The front cover must present
+  the full title with all words of the title equally prominent and
+  visible.  You may add other material on the covers in addition.
+  Copying with changes limited to the covers, as long as they preserve
+  the title of the Document and satisfy these conditions, can be treated
+  as verbatim copying in other respects.
+
+  If the required texts for either cover are too voluminous to fit
+  legibly, you should put the first ones listed (as many as fit
+  reasonably) on the actual cover, and continue the rest onto adjacent
+  pages.
+
+  If you publish or distribute Opaque copies of the Document numbering
+  more than 100, you must either include a machine-readable Transparent
+  copy along with each Opaque copy, or state in or with each Opaque copy
+  a computer-network location from which the general network-using
+  public has access to download using public-standard network protocols
+  a complete Transparent copy of the Document, free of added material.
+  If you use the latter option, you must take reasonably prudent steps,
+  when you begin distribution of Opaque copies in quantity, to ensure
+  that this Transparent copy will remain thus accessible at the stated
+  location until at least one year after the last time you distribute an
+  Opaque copy (directly or through your agents or retailers) of that
+  edition to the public.
+
+  It is requested, but not required, that you contact the authors of the
+  Document well before redistributing any large number of copies, to give
+  them a chance to provide you with an updated version of the Document.
+
+
+  4. MODIFICATIONS
+
+  You may copy and distribute a Modified Version of the Document under
+  the conditions of sections 2 and 3 above, provided that you release
+  the Modified Version under precisely this License, with the Modified
+  Version filling the role of the Document, thus licensing distribution
+  and modification of the Modified Version to whoever possesses a copy
+  of it.  In addition, you must do these things in the Modified Version:
+
+  A. Use in the Title Page (and on the covers, if any) a title distinct
+     from that of the Document, and from those of previous versions
+     (which should, if there were any, be listed in the History section
+     of the Document).  You may use the same title as a previous version
+     if the original publisher of that version gives permission.
+  B. List on the Title Page, as authors, one or more persons or entities
+     responsible for authorship of the modifications in the Modified
+     Version, together with at least five of the principal authors of the
+     Document (all of its principal authors, if it has fewer than five),
+     unless they release you from this requirement.
+  C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+  D. Preserve all the copyright notices of the Document.
+  E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+  F. Include, immediately after the copyright notices, a license notice
+     giving the public permission to use the Modified Version under the
+     terms of this License, in the form shown in the Addendum below.
+  G. Preserve in that license notice the full lists of Invariant Sections
+     and required Cover Texts given in the Document's license notice.
+  H. Include an unaltered copy of this License.
+  I. Preserve the section Entitled "History", Preserve its Title, and add
+     to it an item stating at least the title, year, new authors, and
+     publisher of the Modified Version as given on the Title Page.  If
+     there is no section Entitled "History" in the Document, create one
+     stating the title, year, authors, and publisher of the Document as
+     given on its Title Page, then add an item describing the Modified
+     Version as stated in the previous sentence.
+  J. Preserve the network location, if any, given in the Document for
+     public access to a Transparent copy of the Document, and likewise
+     the network locations given in the Document for previous versions
+     it was based on.  These may be placed in the "History" section.
+     You may omit a network location for a work that was published at
+     least four years before the Document itself, or if the original
+     publisher of the version it refers to gives permission.
+  K. For any section Entitled "Acknowledgements" or "Dedications",
+     Preserve the Title of the section, and preserve in the section all
+     the substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+  L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+  M. Delete any section Entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+  N. Do not retitle any existing section to be Entitled "Endorsements"
+     or to conflict in title with any Invariant Section.
+  O. Preserve any Warranty Disclaimers.
+
+  If the Modified Version includes new front-matter sections or
+  appendices that qualify as Secondary Sections and contain no material
+  copied from the Document, you may at your option designate some or all
+  of these sections as invariant.  To do this, add their titles to the
+  list of Invariant Sections in the Modified Version's license notice.
+  These titles must be distinct from any other section titles.
+
+  You may add a section Entitled "Endorsements", provided it contains
+  nothing but endorsements of your Modified Version by various
+  parties--for example, statements of peer review or that the text has
+  been approved by an organization as the authoritative definition of a
+  standard.
+
+  You may add a passage of up to five words as a Front-Cover Text, and a
+  passage of up to 25 words as a Back-Cover Text, to the end of the list
+  of Cover Texts in the Modified Version.  Only one passage of
+  Front-Cover Text and one of Back-Cover Text may be added by (or
+  through arrangements made by) any one entity.  If the Document already
+  includes a cover text for the same cover, previously added by you or
+  by arrangement made by the same entity you are acting on behalf of,
+  you may not add another; but you may replace the old one, on explicit
+  permission from the previous publisher that added the old one.
+
+  The author(s) and publisher(s) of the Document do not by this License
+  give permission to use their names for publicity for or to assert or
+  imply endorsement of any Modified Version.
+
+
+  5. COMBINING DOCUMENTS
+
+  You may combine the Document with other documents released under this
+  License, under the terms defined in section 4 above for modified
+  versions, provided that you include in the combination all of the
+  Invariant Sections of all of the original documents, unmodified, and
+  list them all as Invariant Sections of your combined work in its
+  license notice, and that you preserve all their Warranty Disclaimers.
+
+  The combined work need only contain one copy of this License, and
+  multiple identical Invariant Sections may be replaced with a single
+  copy.  If there are multiple Invariant Sections with the same name but
+  different contents, make the title of each such section unique by
+  adding at the end of it, in parentheses, the name of the original
+  author or publisher of that section if known, or else a unique number.
+  Make the same adjustment to the section titles in the list of
+  Invariant Sections in the license notice of the combined work.
+
+  In the combination, you must combine any sections Entitled "History"
+  in the various original documents, forming one section Entitled
+  "History"; likewise combine any sections Entitled "Acknowledgements",
+  and any sections Entitled "Dedications".  You must delete all sections
+  Entitled "Endorsements".
+
+
+  6. COLLECTIONS OF DOCUMENTS
+
+  You may make a collection consisting of the Document and other documents
+  released under this License, and replace the individual copies of this
+  License in the various documents with a single copy that is included in
+  the collection, provided that you follow the rules of this License for
+  verbatim copying of each of the documents in all other respects.
+
+  You may extract a single document from such a collection, and distribute
+  it individually under this License, provided you insert a copy of this
+  License into the extracted document, and follow this License in all
+  other respects regarding verbatim copying of that document.
+
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+  A compilation of the Document or its derivatives with other separate
+  and independent documents or works, in or on a volume of a storage or
+  distribution medium, is called an "aggregate" if the copyright
+  resulting from the compilation is not used to limit the legal rights
+  of the compilation's users beyond what the individual works permit.
+  When the Document is included in an aggregate, this License does not
+  apply to the other works in the aggregate which are not themselves
+  derivative works of the Document.
+
+  If the Cover Text requirement of section 3 is applicable to these
+  copies of the Document, then if the Document is less than one half of
+  the entire aggregate, the Document's Cover Texts may be placed on
+  covers that bracket the Document within the aggregate, or the
+  electronic equivalent of covers if the Document is in electronic form.
+  Otherwise they must appear on printed covers that bracket the whole
+  aggregate.
+
+
+  8. TRANSLATION
+
+  Translation is considered a kind of modification, so you may
+  distribute translations of the Document under the terms of section 4.
+  Replacing Invariant Sections with translations requires special
+  permission from their copyright holders, but you may include
+  translations of some or all Invariant Sections in addition to the
+  original versions of these Invariant Sections.  You may include a
+  translation of this License, and all the license notices in the
+  Document, and any Warranty Disclaimers, provided that you also include
+  the original English version of this License and the original versions
+  of those notices and disclaimers.  In case of a disagreement between
+  the translation and the original version of this License or a notice
+  or disclaimer, the original version will prevail.
+
+  If a section in the Document is Entitled "Acknowledgements",
+  "Dedications", or "History", the requirement (section 4) to Preserve
+  its Title (section 1) will typically require changing the actual
+  title.
+
+
+  9. TERMINATION
+
+  You may not copy, modify, sublicense, or distribute the Document except
+  as expressly provided for under this License.  Any other attempt to
+  copy, modify, sublicense or distribute the Document is void, and will
+  automatically terminate your rights under this License.  However,
+  parties who have received copies, or rights, from you under this
+  License will not have their licenses terminated so long as such
+  parties remain in full compliance.
+
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+  The Free Software Foundation may publish new, revised versions
+  of the GNU Free Documentation License from time to time.  Such new
+  versions will be similar in spirit to the present version, but may
+  differ in detail to address new problems or concerns.  See
+  http://www.gnu.org/copyleft/.
+
+  Each version of the License is given a distinguishing version number.
+  If the Document specifies that a particular numbered version of this
+  License "or any later version" applies to it, you have the option of
+  following the terms and conditions either of that specified version or
+  of any later version that has been published (not as a draft) by the
+  Free Software Foundation.  If the Document does not specify a version
+  number of this License, you may choose any version ever published (not
+  as a draft) by the Free Software Foundation.
+
+
+  ADDENDUM: How to use this License for your documents
+
+  To use this License in a document you have written, include a copy of
+  the License in the document and put the following copyright and
+  license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.2
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts.  A copy of the license is included in the section entitled
+      "GNU Free Documentation License".
+
+  If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+  replace the "with...Texts." line with this:
+
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+  If you have Invariant Sections without Cover Texts, or some other
+  combination of the three, merge those two alternatives to suit the
+  situation.
+
+  If your document contains nontrivial examples of program code, we
+  recommend releasing these examples in parallel under your choice of
+  free software license, such as the GNU General Public License,
+  to permit their use in free software.
--- kdemultimedia-3.5.0.orig/debian/noatun.install
+++ kdemultimedia-3.5.0/debian/noatun.install
@@ -0,0 +1,329 @@
+debian/tmp/usr/bin/noatun
+debian/tmp/usr/lib/kconf_update_bin/noatun20update
+debian/tmp/usr/lib/kde3/noatun.la
+debian/tmp/usr/lib/kde3/noatun.so
+debian/tmp/usr/lib/kde3/noatun_dcopiface.la
+debian/tmp/usr/lib/kde3/noatun_dcopiface.so
+debian/tmp/usr/lib/kde3/noatun_excellent.la
+debian/tmp/usr/lib/kde3/noatun_excellent.so
+debian/tmp/usr/lib/kde3/noatun_htmlexport.la
+debian/tmp/usr/lib/kde3/noatun_htmlexport.so
+debian/tmp/usr/lib/kde3/noatun_infrared.la
+debian/tmp/usr/lib/kde3/noatun_infrared.so
+debian/tmp/usr/lib/kde3/noatun_kaiman.la
+debian/tmp/usr/lib/kde3/noatun_kaiman.so
+debian/tmp/usr/lib/kde3/noatun_keyz.la
+debian/tmp/usr/lib/kde3/noatun_keyz.so
+debian/tmp/usr/lib/kde3/noatun_kjofol.la
+debian/tmp/usr/lib/kde3/noatun_kjofol.so
+debian/tmp/usr/lib/kde3/noatun_marquis.la
+debian/tmp/usr/lib/kde3/noatun_marquis.so
+debian/tmp/usr/lib/kde3/noatun_metatag.la
+debian/tmp/usr/lib/kde3/noatun_metatag.so
+debian/tmp/usr/lib/kde3/noatun_monoscope.la
+debian/tmp/usr/lib/kde3/noatun_monoscope.so
+debian/tmp/usr/lib/kde3/noatun_net.la
+debian/tmp/usr/lib/kde3/noatun_net.so
+debian/tmp/usr/lib/kde3/noatun_splitplaylist.la
+debian/tmp/usr/lib/kde3/noatun_splitplaylist.so
+debian/tmp/usr/lib/kde3/noatun_systray.la
+debian/tmp/usr/lib/kde3/noatun_systray.so
+debian/tmp/usr/lib/kde3/noatun_ui.la
+debian/tmp/usr/lib/kde3/noatun_ui.so
+debian/tmp/usr/lib/kde3/noatun_voiceprint.la
+debian/tmp/usr/lib/kde3/noatun_voiceprint.so
+debian/tmp/usr/lib/kde3/noatun_winskin.la
+debian/tmp/usr/lib/kde3/noatun_winskin.so
+debian/tmp/usr/lib/kde3/noatunsimple.la
+debian/tmp/usr/lib/kde3/noatunsimple.so
+debian/tmp/usr/lib/libartseffects.la
+debian/tmp/usr/lib/libartseffects.so
+debian/tmp/usr/lib/libkdeinit_noatun.so
+debian/tmp/usr/lib/libnoatun.so.1
+debian/tmp/usr/lib/libnoatun.so.1.2.0
+debian/tmp/usr/lib/libnoatunarts.la
+debian/tmp/usr/lib/libnoatunarts.so
+debian/tmp/usr/lib/libnoatuncontrols.so.1
+debian/tmp/usr/lib/libnoatuncontrols.so.1.2.0
+debian/tmp/usr/lib/libnoatuntags.so.1
+debian/tmp/usr/lib/libnoatuntags.so.1.2.0
+debian/tmp/usr/lib/libwinskinvis.la
+debian/tmp/usr/lib/libwinskinvis.so
+debian/tmp/usr/lib/mcop/ExtraStereo.mcopclass
+debian/tmp/usr/lib/mcop/ExtraStereoGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Equalizer.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/EqualizerSSE.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/FFTScope.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/FFTScopeStereo.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Listener.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/RawScope.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/RawScopeStereo.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Session.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoEffectStack.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoVolumeControl.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/WinSkinFFT.mcopclass
+debian/tmp/usr/lib/mcop/RawWriter.mcopclass
+debian/tmp/usr/lib/mcop/VoiceRemoval.mcopclass
+debian/tmp/usr/lib/mcop/artseffects.mcopclass
+debian/tmp/usr/lib/mcop/artseffects.mcoptype
+debian/tmp/usr/lib/mcop/noatunarts.mcopclass
+debian/tmp/usr/lib/mcop/noatunarts.mcoptype
+debian/tmp/usr/lib/mcop/winskinvis.mcopclass
+debian/tmp/usr/lib/mcop/winskinvis.mcoptype
+debian/tmp/usr/share/applications/kde/noatun.desktop
+debian/tmp/usr/share/apps/kconf_update/noatun.upd
+debian/tmp/usr/share/apps/noatun/dcopiface.plugin
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.dance
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.jazz
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.metal
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.trance
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.zero
+debian/tmp/usr/share/apps/noatun/excellent.plugin
+debian/tmp/usr/share/apps/noatun/excellentui.rc
+debian/tmp/usr/share/apps/noatun/htmlexport.plugin
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/128x128/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopnone.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunlooprandom.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopsong.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunpause.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/infrared.plugin
+debian/tmp/usr/share/apps/noatun/kaiman.plugin
+debian/tmp/usr/share/apps/noatun/kaimanui.rc
+debian/tmp/usr/share/apps/noatun/keyz.plugin
+debian/tmp/usr/share/apps/noatun/kjofolui.plugin
+debian/tmp/usr/share/apps/noatun/magictable
+debian/tmp/usr/share/apps/noatun/marquis.plugin
+debian/tmp/usr/share/apps/noatun/metatag.plugin
+debian/tmp/usr/share/apps/noatun/monoscope.plugin
+debian/tmp/usr/share/apps/noatun/net.plugin
+debian/tmp/usr/share/apps/noatun/noatunui.plugin
+debian/tmp/usr/share/apps/noatun/simple.plugin
+debian/tmp/usr/share/apps/noatun/simpleui.rc
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_list.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p1.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p3.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p4.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p5.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p6.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_sml.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_voldn.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_volup.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/digbig.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/digmed.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/letters.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/main.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/monoster.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/posbar.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/random.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/volume.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_sm.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_sm_mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/bar_pos.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/bar_vol.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_list.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_mode.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_pref.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_shuffle.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_mode.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/dig.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/digsml.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/letters.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/README
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/conf.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/conf.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/eject.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/icon.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/icon.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/kill.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/kill.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-normal2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-normal2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-vfont.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-vfont.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/long2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/newtext.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/newtext.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/next.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/pause.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/play.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/pos_item.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/repeat.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/reverse.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/shuffle.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/shuffle.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/small-k.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/small-k.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/square.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/square.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/status.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/stop.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/trans-pos.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/trans-slide.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/HexoBronx.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/README.txt
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/active.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/eckig_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/inactive.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/mask.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/pitch.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/splash.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/time_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/volume.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/volume_pitch_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.pl
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_num.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_seek.bmp
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_seek.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdock.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdock2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdocksk.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdockvp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgeq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpitch.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpitchp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgplist.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgplist2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres1.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres3.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvolnum.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvolpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshad.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshad2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshdsk.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshvol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshvp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_eq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_main.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_mainback.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_numbers.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_playback.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_playlist.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_propos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_volbar.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_volpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong_readme.txt
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_base.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_base2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_eq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pl.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pl2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pro.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_vol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_volpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric_readme.txt
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/BALANCE.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/FONT.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/MAIN.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/MONOSTER.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/NUMS_EX.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/PLAYPAUS.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/POSBAR.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/SHUFREP.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/SPEC.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/TEXT.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/VOLUME.BMP
+debian/tmp/usr/share/apps/noatun/splitplaylist.plugin
+debian/tmp/usr/share/apps/noatun/splui.rc
+debian/tmp/usr/share/apps/noatun/systray.plugin
+debian/tmp/usr/share/apps/noatun/systrayui.rc
+debian/tmp/usr/share/apps/noatun/voiceprint.plugin
+debian/tmp/usr/share/apps/noatun/winskin.plugin
+debian/tmp/usr/share/apps/noatun/yhconfig.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/common
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/usr/share/mimelnk/interface/x-winamp-skin.desktop
+
+debian/icons/noatun.xpm		/usr/share/pixmaps
+debian/icons/noatun-16.xpm	/usr/share/pixmaps
--- kdemultimedia-3.5.0.orig/debian/kdemultimedia-kappfinder-data.install
+++ kdemultimedia-3.5.0/debian/kdemultimedia-kappfinder-data.install
@@ -0,0 +1,20 @@
+debian/tmp/etc/xdg/menus/kde-applications-merged/kde-multimedia-music.menu
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ams.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/amsynth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ardour.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/djplay.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/freebirth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/freqtweak.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/galan.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/hydrogen.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jack-rack.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jamin.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/meterbridge.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mixxx.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/muse.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/qjackctl.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/qsynth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/vkeybd.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
+debian/tmp/usr/share/desktop-directories/kde-multimedia-music.directory
--- kdemultimedia-3.5.0.orig/debian/libarts1-akode.install
+++ kdemultimedia-3.5.0/debian/libarts1-akode.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/libarts_akode.la
+debian/tmp/usr/lib/libarts_akode.so
+debian/tmp/usr/lib/mcop/akodearts.mcoptype
+debian/tmp/usr/lib/mcop/akodearts.mcopclass
+debian/tmp/usr/lib/mcop/akodePlayObject.mcopclass
--- kdemultimedia-3.5.0.orig/debian/KUBUNTU-DEBIAN-CHANGES
+++ kdemultimedia-3.5.0/debian/KUBUNTU-DEBIAN-CHANGES
@@ -0,0 +1 @@
+build-dep on libxaw-headers not libxaw8-dev