--- arts-1.5.0/admin/am_edit	2005-11-09 04:19:43.000000000 -0500
+++ arts-1.5.0-new/admin/am_edit	2005-11-12 09:34:04.000000000 -0500
@@ -872,7 +872,7 @@
                 $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
 
                 $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
-                $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
+                $lines .= "\techo '#define KDE_EXPORT' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
                 $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n";
                 $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
 
--- arts-1.5.0/flow/audioioesd.cc	2005-10-10 10:52:27.000000000 -0400
+++ arts-1.5.0-new/flow/audioioesd.cc	2005-11-12 09:34:04.000000000 -0500
@@ -213,6 +213,9 @@
 		// of any portable way to peek at the socket's send or receive
 		// buffers.
 
+	case autoDetect:
+		return 12;
+
 	default:
 		return param(p);
 	}
--- arts-1.5.0/flow/gsl/Makefile.am	2005-09-10 04:13:33.000000000 -0400
+++ arts-1.5.0-new/flow/gsl/Makefile.am	2005-11-12 09:34:04.000000000 -0500
@@ -15,7 +15,7 @@
 libgsl_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lm $(LIBPOSIX4) $(GSL_LIBS) $(LIB_POLL) $(GLIB_LIBADD)
 libgsl_la_LDFLAGS = -no-undefined $(all_libraries)
 
-#noinst_PROGRAMS = $(GSL_NOINST_PROGS)
+noinst_PROGRAMS = $(GSL_NOINST_PROGS)
 
 GSL_progs_ldadd = libgsl.la -lm $(LIBPTHREAD)
 
--- arts-1.5.0/x11/Makefile.am	2005-09-10 04:13:34.000000000 -0400
+++ arts-1.5.0-new/x11/Makefile.am	2005-11-12 09:34:04.000000000 -0500
@@ -6,7 +6,7 @@
 
 libx11globalcomm_la_SOURCES = x11globalcomm.cc x11globalcomm_impl.cc
 libx11globalcomm_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIB_X11)
-libx11globalcomm_la_LDFLAGS = -no-undefined -module -version-info 1:0 $(X_LDFLAGS) $(all_libraries)
+libx11globalcomm_la_LDFLAGS = -no-undefined -module -version-info 1:0 $(all_libraries) $(X_LDFLAGS)
 
 DISTCLEANFILES = x11globalcomm.cc x11globalcomm.h \
                  x11globalcomm.mcoptype x11globalcomm.mcopclass