applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

You can't mix GTK2 and GTK3, so depend on gtk-3.0 versions of libraries

Browse source
This commit is contained in:
Richard Hughes 2010-06-19 21:13:10 +01:00 • committed by Thomas Wood
parent 93009261bb
commit f4ef191462
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -52,7 +52,7 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
AC_SUBST(TYPING_BREAK) AC_SUBST(TYPING_BREAK)
AC_SUBST(SCREENSAVER_LIBS) AC_SUBST(SCREENSAVER_LIBS)
PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [ PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3, [
CANBERRA_GTK=1 CANBERRA_GTK=1
AC_SUBST(LIBCANBERRA_GTK_CFLAGS) AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
AC_SUBST(LIBCANBERRA_GTK_LIBS) AC_SUBST(LIBCANBERRA_GTK_LIBS)
@ -112,7 +112,7 @@ COMMON_MODULES="gtk+-3.0 >= 2.90.0 dnl
gio-2.0 dnl gio-2.0 dnl
gconf-2.0 dnl gconf-2.0 dnl
libxml-2.0 dnl libxml-2.0 dnl
gnome-desktop-2.0 >= 2.29.4" gnome-desktop-3.0 >= 2.29.4"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0 gio-unix-2.0) PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0 gio-unix-2.0)