diff --git a/desmume/configure.ac b/desmume/configure.ac index e9f1fe088..5504e5f6b 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -57,6 +57,7 @@ AC_CHECK_HEADERS([GL/glu.h]) dnl - Check for GTK and/or libglade GLIB_VER=2.8 +GTK_VER=2.6 AC_CHECK_TOOL(HAVE_PKG, pkg-config) AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ if test ! "x$HAVE_PKG" = "x" ; then @@ -69,9 +70,12 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ fi PKG_CHECK_MODULES(GTK, - "gtk+-2.0", + gtk+-2.0 >= $GTK_VER, HAVE_GTK=yes, HAVE_GTK=no) + if test "$HAVE_GTK" = "no"; then + AC_MSG_ERROR([gtk-2.0 >= $GTK_VER is required to build desmume gtk frontend]) + fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index b70ce0f96..2dd73a106 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -1771,11 +1771,7 @@ common_gtk_main( struct configured_features *my_config) pMenu = gtk_menu_new(); -#if ((GTK_MAJOR_VERSION >= 2) && (GTK_MINOR_VERSION >= 6)) pMenuItem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT,NULL); -#else - pMenuItem = gtk_menu_item_new_with_label("About"); -#endif g_signal_connect(G_OBJECT(pMenuItem), "activate", G_CALLBACK(About), (GtkWidget*) pWindow); gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), pMenuItem);