diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2012-11-07 10:58:40 -0800 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-03 03:34:08 -0600 |
| commit | 97b14f5ca62d37311798ecdd39ea4368785a2fa8 (patch) | |
| tree | 3b4024a3a43369465925f212f20b8d3e442454ac | |
| parent | 5e020e7ac951add45ff47dda38b6f5ed873bfbca (diff) | |
| download | pango-97b14f5ca62d37311798ecdd39ea4368785a2fa8.tar.gz | |
Link to gthread-2.0
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | pango/Makefile.am | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index da10fd71..bb37a60f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 # diff --git a/pango/Makefile.am b/pango/Makefile.am index ecc49c7a..e37a579b 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -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 \ |