diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-05-13 15:14:29 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-05-13 15:17:27 +0200 |
| commit | e3b2212bc5c4884eab356ae263b8318e10c379ac (patch) | |
| tree | a9469caaa939605820626414d8c17d5cb847930a /util | |
| parent | acfbf95a0c7620359fd917224b5b391702740190 (diff) | |
build: Fix pthread detection
Incorporate the pthread detection code from the autoconf archive. Should
fix build on obscure archs that pretend to be UNIXy - like Mac OS X
Tiger.
http://www.gnu.org/software/autoconf-archive/
http://www.gnu.org/software/autoconf-archive/ax_pthread.html
Diffstat (limited to 'util')
| -rw-r--r-- | util/cairo-sphinx/Makefile.am | 5 | ||||
| -rw-r--r-- | util/cairo-trace/Makefile.am | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am index 2b1abbfc..85368df8 100644 --- a/util/cairo-sphinx/Makefile.am +++ b/util/cairo-sphinx/Makefile.am @@ -16,15 +16,14 @@ cairo_sphinx_la_LIBADD = -ldl cairo_sphinx_SOURCES = sphinx.c cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\"" -cairo_sphinx_CFLAGS = $(real_pthread_CFLAGS) $(CAIRO_CFLAGS) $(glib_CFLAGS) +cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(glib_CFLAGS) cairo_sphinx_LDADD = \ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ $(top_builddir)/src/libcairo.la \ $(glib_LIBS) \ $(CAIRO_LDADD) \ - $(shm_LIBS) \ - $(real_pthread_LIBS) + $(shm_LIBS) cairo_sphinx_DEPENDENCIES = \ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am index 16403a8f..a792cc64 100644 --- a/util/cairo-trace/Makefile.am +++ b/util/cairo-trace/Makefile.am @@ -13,7 +13,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) libcairo_trace_la_LDFLAGS = -no-undefined -libcairo_trace_la_LIBADD = -lz $(pthread_LIBS) +libcairo_trace_la_LIBADD = -lz $(PTHREAD_LIBS) if CAIRO_HAS_DL libcairo_trace_la_LIBADD += -ldl endif |