Make --disable-threads work again. (#71034)

2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* configure.in: Make --disable-threads work again. (#71034)

	* gthread-impl.c: Only compile most of this file, if
	G_THREAD_ENABLED is set.

diff --git a/ChangeLog b/ChangeLog
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9d0bd15..0f6a28a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Make --disable-threads work again. (#71034)
+
 Fri Feb  8 23:52:27 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gobject/gvaluetransform.c: Register transformations for

diff --git a/configure.in b/configure.in
index 7391b5f..252d80c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1283,7 +1283,7 @@ case $have_threads in
           g_threads_impl="WIN32"
           G_THREAD_LIBS=""
           ;;
-        none)
+        none|no)
           g_threads_impl="NONE"
            ;;
         *)

diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index dde7d75..b4a8704 100644 (file)
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-09  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gthread-impl.c: Only compile most of this file, if
+       G_THREAD_ENABLED is set.
+       
 2002-01-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread-solaris.c: Use g_free instead of free. Pointed out by

diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index f8bebb7..f38ce81 100644 (file)
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -37,6 +37,8 @@
 
 #include <glib.h>
 
+#ifdef G_THREAD_ENABLED
+
 static gboolean thread_system_already_initialized = FALSE;
 static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1];
 
@@ -285,7 +287,7 @@ g_thread_init_with_errorcheck_mutexes (GThreadFunctions* init)
    * of g_thread_functions_for_glib_use_default based on operating
    * system version, C library version, or whatever. */
   g_thread_impl_init();
-#endif
+#endif /* HAVE_G_THREAD_IMPL_INIT */
 
   errorcheck_functions = g_thread_functions_for_glib_use_default;
   errorcheck_functions.mutex_new = g_mutex_new_errorcheck_impl;
@@ -311,10 +313,6 @@ g_thread_init (GThreadFunctions* init)
 {
   gboolean supported;
 
-#ifndef        G_THREADS_ENABLED
-  g_error ("GLib thread support is disabled.");
-#endif /* !G_THREADS_ENABLED */
-
   if (thread_system_already_initialized)
     g_error ("GThread system may only be initialized once.");
     
@@ -390,3 +388,13 @@ g_thread_init (GThreadFunctions* init)
   /* we want the main thread to run with normal priority */
   g_thread_set_priority (g_thread_self(), G_THREAD_PRIORITY_NORMAL);
 }
+
+#else /* !G_THREADS_ENABLED */
+
+void
+g_thread_init (GThreadFunctions* init)
+{
+  g_error ("GLib thread support is disabled.");
+}
+
+#endif /* !G_THREADS_ENABLED */