Reverted my last commit:

2000-09-30  Martin Baulig  <baulig@suse.de>

	* configure.in (HAVE_THREADS): New automake conditional.
	* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
	actually have threads.

diff --git a/ChangeLog b/ChangeLog
index 1677615..d718745 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1677615..d718745 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -3,12 +3,6 @@
        * gnode.c (g_node_insert_after): Added function to keep symetry
        with g_node_insert_before. 
 
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-       * configure.in (HAVE_THREADS): New automake conditional.
-       * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
-       actually have threads.
-
 2000-09-29  Martin Baulig  <baulig@suse.de>
 
        Several minor ANSI C fixes.

diff --git a/Makefile.am b/Makefile.am
index d6993ba..104d783 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-if HAVE_THREADS
-gthread = gthread
-else
-gthread =
-endif
-
-SUBDIRS = . gobject gmodule $(gthread) docs tests build
+SUBDIRS = . gobject gmodule gthread docs tests build
 
 bin_SCRIPTS=glib-config-2.0
 BUILT_SOURCES=glib-config-2.0

diff --git a/configure.in b/configure.in
index a2fa13e..be002dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -777,7 +777,6 @@ if test "x$have_threads" = xnone && test "x$want_threads" != xno; then
 else
        AC_MSG_RESULT($have_threads)
 fi
-AM_CONDITIONAL(HAVE_THREADS, test "x$have_threads" != xnone && test "x$want_threads" != xno)
 
 
 dnl determination of G_THREAD_CFLAGS

diff --git a/glib/Makefile.am b/glib/Makefile.am
index d6993ba..104d783 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -2,13 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-if HAVE_THREADS
-gthread = gthread
-else
-gthread =
-endif
-
-SUBDIRS = . gobject gmodule $(gthread) docs tests build
+SUBDIRS = . gobject gmodule gthread docs tests build
 
 bin_SCRIPTS=glib-config-2.0
 BUILT_SOURCES=glib-config-2.0