callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more linking fallout

Browse Source 
We are using xinput and gmodule API in a few places in libgtk.
https://bugzilla.gnome.org/show_bug.cgi?id=665326
This commit is contained in:
Matthias Clasen
2011-12-15 23:35:06 -05:00
parent cea35016db
commit 7f5a665b95
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -687,13 +687,11 @@ esac
# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working # 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, :, AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR([ AC_MSG_ERROR([
*** GLIB glib_required_version or better is required. The latest version of *** GLIB glib_required_version or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
gobject gmodule-no-export gthread) gobject gmodule-no-export)
dnl dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. 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]) [Define to 1 if XFree XInput should be used])
X_PACKAGES="$X_PACKAGES xi" X_PACKAGES="$X_PACKAGES xi"
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
AC_CHECK_HEADER(X11/extensions/XInput2.h, AC_CHECK_HEADER(X11/extensions/XInput2.h,
have_xinput2=yes have_xinput2=yes
@ -1264,7 +1263,7 @@ if test "x$enable_x11_backend" = xyes; then
fi fi
GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB" 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 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files # into the pkg-config files
@ -1319,7 +1318,7 @@ GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS= 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_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 if test x"$os_win32" = xyes; then
GTK_EXTRA_CFLAGS="$msnative_struct" GTK_EXTRA_CFLAGS="$msnative_struct"

2
gtk/Makefile.am
View File

@ -50,6 +50,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GMODULE_CFLAGS) \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS) \ $(GTK_DEP_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE) $(INCLUDED_IMMODULE_DEFINE)
@ -107,6 +108,7 @@ libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \ libadd = \
$(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/a11y/libgail.la \ $(top_builddir)/gtk/a11y/libgail.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
deps = \ deps = \
$(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gdk/libgdk-3.la \