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.
This commit is contained in:
Martin Baulig 2000-09-29 22:18:56 +00:00 committed by Martin Baulig
parent fbb33fd6d1
commit 79b416d023
11 changed files with 63 additions and 2 deletions

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -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> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';

View File

@ -2,7 +2,13 @@
AUTOMAKE_OPTIONS = 1.4 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 bin_SCRIPTS=glib-config-2.0
BUILT_SOURCES=glib-config-2.0 BUILT_SOURCES=glib-config-2.0

View File

@ -777,6 +777,7 @@ if test "x$have_threads" = xnone && test "x$want_threads" != xno; then
else else
AC_MSG_RESULT($have_threads) AC_MSG_RESULT($have_threads)
fi fi
AM_CONDITIONAL(HAVE_THREADS, test "x$have_threads" != xnone && test "x$want_threads" != xno)
dnl determination of G_THREAD_CFLAGS dnl determination of G_THREAD_CFLAGS

View File

@ -2,7 +2,13 @@
AUTOMAKE_OPTIONS = 1.4 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 bin_SCRIPTS=glib-config-2.0
BUILT_SOURCES=glib-config-2.0 BUILT_SOURCES=glib-config-2.0