[cairo-commit] configure.ac util/cairo-sphinx

[Benjamin Otte]

 configure.ac                  |    2 +-
 util/cairo-sphinx/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3eecf2f60c85e0195360ff3c3a54d58ceaa4a6f1
Author: Benjamin Otte <otte at gnome.org>
Date:   Mon Nov 2 13:20:25 2009 +0100

    sphinx: Add required pthread libs
    
    Try again, this time for real hopefully.

diff --git a/configure.ac b/configure.ac
index e5582a4..325af10 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 adc5659..66a2e3c 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	\