diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-08-13 10:44:09 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-08-13 10:44:09 -0400 |
| commit | 0e098249b1fae0de3e084dcdb7e96d36be05cca1 (patch) | |
| tree | 69f2a4206398ed518a017a227efb04ffb9c9b6b3 /configure.ac | |
| parent | 9a5f243f73f4f93cce5d69bd1d8fccd674ac1f77 (diff) | |
| parent | 12d2e1f6007b94b29237dd5bcd22032ff922d327 (diff) | |
| download | mutter-0e098249b1fae0de3e084dcdb7e96d36be05cca1.tar.gz | |
Merge remote-tracking branch 'origin/master' into wayland
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 993c775ae..fd3c45579 100644 --- a/configure.ac +++ b/configure.ac @@ -138,9 +138,6 @@ AM_GLIB_GNU_GETTEXT ## here we get the flags we'll actually use # GRegex requires Glib-2.14.0 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0) -# gtk_window_set_icon_name requires gtk2+-2.6.0 -PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0) -PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0) # Unconditionally use this dir to avoid a circular dep with gnomecc GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings" @@ -350,9 +347,6 @@ if test "x$found_xsync" = "xyes"; then fi MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" -MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" -MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" found_sm=no case "$MUTTER_LIBS" in @@ -482,10 +476,8 @@ doc/man/Makefile doc/reference/Makefile doc/reference/meta-docs.sgml src/Makefile -src/wm-tester/Makefile src/libmutter.pc src/mutter-plugins.pc -src/tools/Makefile src/compositor/plugins/Makefile protocol/Makefile data/Makefile |