diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-12-15 23:35:06 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-12-15 23:35:06 -0500 |
| commit | 7f5a665b953807ca9842b4c15bbf63880f1907b6 (patch) | |
| tree | c0acfc0243f96b8fc8b96f5aaea3a57fa9d6d57d | |
| parent | cea35016dbd9a85eba100bd728516f62e1e15a98 (diff) | |
| download | gtk+-7f5a665b953807ca9842b4c15bbf63880f1907b6.tar.gz | |
Fix more linking fallout
We are using xinput and gmodule API in a few places in libgtk.
https://bugzilla.gnome.org/show_bug.cgi?id=665326
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | gtk/Makefile.am | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 004af48afb..313c6c8ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -687,13 +687,11 @@ esac # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working # -GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0" - AM_PATH_GLIB_2_0(glib_required_version, :, AC_MSG_ERROR([ *** GLIB glib_required_version or better is required. The latest version of *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), - gobject gmodule-no-export gthread) + gobject gmodule-no-export) dnl dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. @@ -1120,6 +1118,7 @@ if test "x$enable_x11_backend" = xyes; then [Define to 1 if XFree XInput should be used]) X_PACKAGES="$X_PACKAGES xi" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi" AC_CHECK_HEADER(X11/extensions/XInput2.h, have_xinput2=yes @@ -1264,7 +1263,7 @@ if test "x$enable_x11_backend" = xyes; then fi GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB" -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS" +GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS" # # If we aren't writing explicit dependencies, then don't put the extra libraries we need # into the pkg-config files @@ -1319,7 +1318,7 @@ GTK_EXTRA_LIBS= GTK_EXTRA_CFLAGS= GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB" -GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" +GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" if test x"$os_win32" = xyes; then GTK_EXTRA_CFLAGS="$msnative_struct" diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bbbf43a6e0..f011ec6e87 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -50,6 +50,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/gdk \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GMODULE_CFLAGS) \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) \ $(INCLUDED_IMMODULE_DEFINE) @@ -107,6 +108,7 @@ libgtkincludedir = $(includedir)/gtk-3.0/gtk libadd = \ $(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gtk/a11y/libgail.la \ + $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) deps = \ $(top_builddir)/gdk/libgdk-3.la \ |