# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191275638 -10800
# Node ID 98893c1e9f981a47f392ea909e8e0b5c3f73d4e7
# Parent  66fb09cd894e9ec8a6e2fd81f01227ccbb48942a# Parent  a98c54cb96aab4d47856ad1fab068d6b0ee64317
Branch merge.

diff -r a98c54cb96aa -r 98893c1e9f98 src/aac/Makefile
diff -r a98c54cb96aa -r 98893c1e9f98 src/sid/xs_genui.c
--- a/src/sid/xs_genui.c	Tue Oct 02 00:50:07 2007 +0300
+++ b/src/sid/xs_genui.c	Tue Oct 02 00:53:58 2007 +0300
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff -r a98c54cb96aa -r 98893c1e9f98 src/sid/xs_glade.c
--- a/src/sid/xs_glade.c	Tue Oct 02 00:50:07 2007 +0300
+++ b/src/sid/xs_glade.c	Tue Oct 02 00:53:58 2007 +0300
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r a98c54cb96aa -r 98893c1e9f98 src/sid/xs_glade.h
--- a/src/sid/xs_glade.h	Tue Oct 02 00:50:07 2007 +0300
+++ b/src/sid/xs_glade.h	Tue Oct 02 00:53:58 2007 +0300
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff -r a98c54cb96aa -r 98893c1e9f98 src/sid/xs_interface.c
--- a/src/sid/xs_interface.c	Tue Oct 02 00:50:07 2007 +0300
+++ b/src/sid/xs_interface.c	Tue Oct 02 00:53:58 2007 +0300
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r a98c54cb96aa -r 98893c1e9f98 src/sid/xs_support.h
--- a/src/sid/xs_support.h	Tue Oct 02 00:50:07 2007 +0300
+++ b/src/sid/xs_support.h	Tue Oct 02 00:53:58 2007 +0300
@@ -5,7 +5,9 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib.h>
 #include <stdio.h>
diff -r a98c54cb96aa -r 98893c1e9f98 src/timidity/Makefile