diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-02 11:56:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-02 12:01:45 +0000 |
| commit | 837eb577b4707e447fafb0dfca378ecf4ea3fda5 (patch) | |
| tree | e1cc62cb0e6e8195f2984cf4649570fa5c0be77d | |
| parent | 942a15ba9e85fa3297ad6e65270928ad3c1c0a42 (diff) | |
sphinx: Add required pthread libs
Switching to pthread-stubs broke the build for sphinx on unbroken
platforms [those that do not unnecessarily link against -lpthreads].
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | util/cairo-sphinx/Makefile.am | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2680f212..e5582a42 100644 --- a/configure.ac +++ b/configure.ac @@ -498,6 +498,13 @@ if test "x$have_pthread" = xno -a "x$use_pthread" = xyes; then AC_MSG_ERROR([pthread requested but not found]) fi +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)"])]) +AM_CONDITIONAL(HAVE_REAL_PTHREAD, test "x$have_real_pthread" = "xyes") + dnl =========================================================================== CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [ diff --git a/util/cairo-sphinx/Makefile.am b/util/cairo-sphinx/Makefile.am index 845888c7..adc5659e 100644 --- a/util/cairo-sphinx/Makefile.am +++ b/util/cairo-sphinx/Makefile.am @@ -16,14 +16,15 @@ cairo_sphinx_la_LIBADD = -ldl cairo_sphinx_SOURCES = sphinx.c cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\"" -cairo_sphinx_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 \ $(top_builddir)/src/libcairo.la \ $(glib_LIBS) \ $(CAIRO_LDADD) \ - -lrt + -lrt \ + $(REAL_PTHREAD_LIBS) cairo_sphinx_DEPENDENCIES = \ $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ |