New automake conditional. Only compile the gthread subdirectory if we

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 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 38da20a91c072e1104f55a9d3ed91926bc4c4bc9..f7acbb0fd097c1585dfc15278b993e798a881d2d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+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>
 
        * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

diff --git a/Makefile.am b/Makefile.am
index f0e75e5df6553972f5e71393c17cf5a1aa20273b..ecff8b13222ac9caa91f8260e79c144a32126473 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,13 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests build
+if HAVE_THREADS
+gthread = gthread
+else
+gthread =
+endif
+
+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 be002dc663489c6ea0ce6b981db98211ec561d00..a2fa13e74197f237bceb609b75b1b3bd7974da66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -777,6 +777,7 @@ 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 f0e75e5df6553972f5e71393c17cf5a1aa20273b..ecff8b13222ac9caa91f8260e79c144a32126473 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -2,7 +2,13 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests build
+if HAVE_THREADS
+gthread = gthread
+else
+gthread =
+endif
+
+SUBDIRS = . gobject gmodule $(gthread) docs tests build
 
 bin_SCRIPTS=glib-config-2.0
 BUILT_SOURCES=glib-config-2.0