diff options
| author | Benjamin Otte <otte@gnome.org> | 2009-11-02 13:20:25 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2009-11-02 13:20:25 +0100 |
| commit | 3eecf2f60c85e0195360ff3c3a54d58ceaa4a6f1 (patch) | |
| tree | 2143e434b7c0f4e01a4985bf7f385e70bdab9344 | |
| parent | 837eb577b4707e447fafb0dfca378ecf4ea3fda5 (diff) | |
sphinx: Add required pthread libs
Try again, this time for real hopefully.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | util/cairo-sphinx/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e5582a42..325af109 100644 --- a/configure.ac +++ b/configure.ac @@ -502,7 +502,7 @@ have_real_pthread=no real_pthread_REQUIRES="pthread" PKG_CHECK_MODULES(real_pthread, $real_pthread_REQUIRES, [have_real_pthread=yes], - [AC_CHECK_HEADERS([pthread.h],, [have_real_pthread="no (requires $real_pthread_REQUIRES)"])]) + [AC_CHECK_HEADERS([pthread.h],[real_pthread_LIBS="-lpthread"], [have_real_pthread="no (requires $real_pthread_REQUIRES)"])]) AM_CONDITIONAL(HAVE_REAL_PTHREAD, test "x$have_real_pthread" = "xyes") dnl =========================================================================== diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am index adc5659e..66a2e3cb 100644 --- a/util/cairo-sphinx/Makefile.am +++ b/util/cairo-sphinx/Makefile.am @@ -16,7 +16,7 @@ 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 = $(real_pthread_CFLAGS) $(CAIRO_CFLAGS) $(glib_CFLAGS) cairo_sphinx_LDADD = \ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ @@ -24,7 +24,7 @@ cairo_sphinx_LDADD = \ $(glib_LIBS) \ $(CAIRO_LDADD) \ -lrt \ - $(REAL_PTHREAD_LIBS) + $(real_pthread_LIBS) cairo_sphinx_DEPENDENCIES = \ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ |