summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-02-21 11:39:42 +0000
committerCosimo Cecchi <cosimoc@src.gnome.org>2009-02-21 11:39:42 +0000
commitc3bb696fb71405185f8841ba7e098a8c09446b78 (patch)
treea58c970ecbce0ac8cc324119a8ca5adca12b0edc
parent2a274b6fce70180e9188bf1334d83d9a89f59202 (diff)
downloadnautilus-c3bb696fb71405185f8841ba7e098a8c09446b78.tar.gz
explicitely depend on gthread (#572604).
2009-02-21 Cosimo Cecchi <cosimoc@gnome.org> * configure.in: explicitely depend on gthread (#572604). svn path=/trunk/; revision=14988
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f381c588..ab709049a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-21 Cosimo Cecchi <cosimoc@gnome.org>
+
+ * configure.in: explicitely depend on gthread (#572604).
+
2009-02-20 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-container.c (style_set):
diff --git a/configure.in b/configure.in
index 21d7d76d8..29192504d 100644
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
PKG_CHECK_MODULES(ALL, [
glib-2.0 >= glib_minver
gnome-desktop-2.0 >= gnome_desktop_minver
+ gthread-2.0
gio-unix-2.0
gio-2.0
pango >= pango_minver
@@ -414,9 +415,10 @@ AC_SUBST(RENDER_LIBS)
dnl ==========================================================================
dnl libegg
-LIBEGG_MODULES="gtk+-2.0 gthread-2.0"
+LIBEGG_MODULES="gtk+-2.0"
LIBEGG_CFLAGS="`$PKG_CONFIG --cflags $LIBEGG_MODULES`"
AC_SUBST(LIBEGG_CFLAGS)
+LIBEGG_LIBS="`$PKG_CONFIG --libs $LIBEGG_MODULES`"
AC_SUBST(LIBEGG_LIBS)
dnl libnautilus-extension
@@ -427,7 +429,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
dnl core nautilus
-CORE_MODULES="glib-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"