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].
This commit is contained in:
Chris Wilson 2009-11-02 11:56:29 +00:00
parent 942a15ba9e
commit 837eb577b4
2 changed files with 10 additions and 2 deletions

View file

@ -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, [

View file

@ -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 \