--- glib-2.4.0/tests/gobject/Makefile.am~2	Fri Oct 24 21:07:42 2003
+++ glib-2.4.0/tests/gobject/Makefile.am	Thu Dec  4 15:13:36 2003
@@ -56,7 +56,7 @@ test_programs =					\
 
 check_PROGRAMS = $(test_programs)
 
-TESTS = $(test_programs)
+TESTS = $(check_PROGRAMMS)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
 
--- glib-2.4.0/tests/Makefile.am~2	Fri Sep 12 18:45:58 2003
+++ glib-2.4.0/tests/Makefile.am	Thu Dec  4 15:12:50 2003
@@ -105,7 +105,7 @@ test_script_support_programs = markup-te
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
-TESTS = $(test_programs) $(test_scripts)
+TESTS = $(check_PROGRAMS) $(test_scripts)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
 
--- glib-2.4.0/tests/gobject/Makefile.am~3	Thu Jan 15 16:13:20 2004
+++ glib-2.4.0/tests/gobject/Makefile.am	Thu Jan 15 19:06:28 2004
@@ -23,7 +23,7 @@ libtestgobject_la_SOURCES =	\
 if CROSS_COMPILING
   glib_genmarshal=$(GLIB_GENMARSHAL)
 else
-  glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
+  glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal$(EXEEXT)
 endif
 
 testmarshal.h: stamp-testmarshal.h
--- glib-2.64/glib/gmain.c~1	2005-04-01 21:41:12.000000000 +0000
+++ glib-2.64/glib/gmain.c	2005-04-09 12:04:26.000000000 +0000
@@ -3562,11 +3562,12 @@ g_child_watch_source_init_single (void)
   g_assert (child_watch_init_state == CHILD_WATCH_UNINITIALIZED);
 
   child_watch_init_state = CHILD_WATCH_INITIALIZED_SINGLE;
-
+#ifdef SIGCHLD
   action.sa_handler = g_child_watch_signal_handler;
   sigemptyset (&action.sa_mask);
   action.sa_flags = SA_NOCLDSTOP;
   sigaction (SIGCHLD, &action, NULL);
+#endif
 }
 
 static gpointer
@@ -3627,11 +3628,12 @@ g_child_watch_source_init_multi_threaded
   if (g_thread_create (child_watch_helper_thread, NULL, FALSE, &error) == NULL)
     g_error ("Cannot create a thread to monitor child exit status: %s\n", error->message);
   child_watch_init_state = CHILD_WATCH_INITIALIZED_THREADED;
- 
+#ifdef SIGCHLD
   action.sa_handler = g_child_watch_signal_handler;
   sigemptyset (&action.sa_mask);
   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
   sigaction (SIGCHLD, &action, NULL);
+#endif
 }
 
 static void
--- glib-2.5.7/glib/gbacktrace.c~1	2004-09-16 06:05:52.000000000 +0000
+++ glib-2.5.7/glib/gbacktrace.c	2004-12-05 13:45:26.000000000 +0000
@@ -193,11 +193,13 @@ g_on_error_stack_trace (const gchar *prg
 
 static gboolean stack_trace_done = FALSE;
 
+#ifdef SIGCHLD
 static void
 stack_trace_sigchld (int signum)
 {
   stack_trace_done = TRUE;
 }
+#endif
 
 static void
 stack_trace (char **args)
@@ -213,7 +215,9 @@ stack_trace (char **args)
   char c;
 
   stack_trace_done = FALSE;
+#ifdef SIGCHLD
   signal (SIGCHLD, stack_trace_sigchld);
+#endif
 
   if ((pipe (in_fd) == -1) || (pipe (out_fd) == -1))
     {
--- glib-2.8.5/tests/refcount/Makefile.am~1	2005-09-11 16:30:02.000000000 +0000
+++ glib-2.8.5/tests/refcount/Makefile.am	2006-01-12 18:00:48.000000000 +0000
@@ -34,6 +34,6 @@ check_PROGRAMS = $(test_programs)
 
 all: $(check_PROGRAMS)
 
-TESTS = $(test_programs)
+TESTS = $(check_PROGRAMS)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset