Link to gthread-2.0
authorBehdad Esfahbod <behdad@behdad.org>
Wed, 7 Nov 2012 18:58:40 +0000 (10:58 -0800)
committerBehdad Esfahbod <behdad@behdad.org>
Thu, 3 Jan 2013 09:34:08 +0000 (03:34 -0600)
configure.ac
pango/Makefile.am

index da10fd7..bb37a60 100644 (file)
@@ -454,7 +454,7 @@ fi
 # Checks for GLib
 #
 GLIB_REQUIRED_VERSION=2.33.12
-GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0"
+GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0 gthread-2.0"
 
 PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,
   AC_MSG_ERROR([
@@ -465,11 +465,6 @@ PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 AC_SUBST(GLIB_MKENUMS)
 
-
-# Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
-# necesary defines for thread-safety.
-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
-
 #
 # Checks for LibThai
 #
index ecc49c7..e37a579 100644 (file)
@@ -89,7 +89,7 @@ libpango_1_0_la_SOURCES =                     \
        pango-renderer.c                        \
        pango-script.c                          \
        pango-script-lang-table.h               \
-       pango-script-private.h                          \
+       pango-script-private.h                  \
        pango-tabs.c                            \
        pango-utils.c                           \
        reorder-items.c                         \