[gegl] Remove code depending on GTK+

[Jon Nordby <jonnor src gnome org>]

commit afb5da0d8602924d4256841095428b85c1d67bb2
Author: Jon Nordby <jononor gmail com>
Date:   Wed Jun 22 22:17:55 2011 +0200

    Remove code depending on GTK+
    
    Has been moved to separate repository, gegl-gtk
    http://git.gnome.org/browse/gegl-gtk/

 configure.ac                               |   68 +-----
 examples/Makefile.am                       |    7 -
 examples/gegl-paint.c                      |  197 -------------
 examples/multiplayer-paint.sh              |   12 -
 examples/util/gegl-view.c                  |  412 ----------------------------
 examples/util/gegl-view.h                  |   49 ----
 operations/workshop/external/Makefile.am   |    7 -
 operations/workshop/external/gtk-display.c |  239 ----------------
 8 files changed, 2 insertions(+), 989 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 63cdd02..35de2eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,7 @@ m4_define([gimp_full_name], [Generic Graphical Library])
 # required versions of external libraries
 m4_define([babl_required_version], [0.1.4])
 m4_define([glib_required_version], [2.22.0])
-m4_define([gtk2_required_version], [2.18.0])
-m4_define([gtk3_required_version], [3.0.0])
+m4_define([gdk_pixbuf_required_version], [2.24])
 m4_define([lua_required_version], [5.1.0])
 m4_define([cairo_required_version], [0.0.0])
 m4_define([pango_required_version], [0.0.0])
@@ -119,11 +118,7 @@ gegltargetlib=libgegl-$GEGL_API_VERSION.la
 AC_SUBST(gegltargetlib)
 
 GLIB_REQUIRED_VERSION=glib_required_version
-GTK2_REQUIRED_VERSION=gtk2_required_version
-GTK3_REQUIRED_VERSION=gtk3_required_version
 AC_SUBST(GLIB_REQUIRED_VERSION)
-AC_SUBST(GTK2_REQUIRED_VERSION)
-AC_SUBST(GTK3_REQUIRED_VERSION)
 
 LUA_REQUIRED_VERSION=lua_required_version
 AC_SUBST(LUA_REQUIRED_VERSION)
@@ -433,63 +428,6 @@ PKG_CHECK_MODULES(DEP,
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
 
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0|no],[which gtk+ version to compile against (default: 2.0)])],
-  [case "$with_gtk" in
-     2.0|3.0|no) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=$GTK2_REQUIRED_VERSION
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=GTK3_REQUIRED_VERSION
-       ;;
-esac
-
-have_gtk2="no"
-if test "x$with_gtk" = "x2.0"; then
-  PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION,
-    have_gtk2="yes"
-    AC_DEFINE(HAVE_GTK2, 1, [Define to 1 to compile with gtk2 support.])
-    GTK_CFLAGS="$GTK2_CFLAGS"
-    GTK_LIBS="$GTK2_LIBS",
-    have_gtk2="no  (gtk+ 2.0 not found)")
-fi
-
-have_gtk3="no"
-if test "x$with_gtk" = "x3.0"; then
-  PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= $GTK2_REQUIRED_VERSION,
-    have_gtk3="yes"
-    AC_DEFINE(HAVE_GTK3, 1, [Define to 1 to compile with gtk3 support.])
-    GTK_CFLAGS="$GTK3_CFLAGS"
-    GTK_LIBS="$GTK3_LIBS",
-    have_gtk3="no  (gtk+ 3.0 not found)")
-fi
-
-have_gtk="no"
-if test "$have_gtk2" = "yes"; then
-	have_gtk="2.0"
-    AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
-elif test "$have_gtk3" = "yes"; then
-	have_gtk="3.0"
-    AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
-fi
-
-AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" != "no")
-AM_CONDITIONAL(HAVE_GTK2, test "$have_gtk2" = "yes")
-AM_CONDITIONAL(HAVE_GTK3, test "$have_gtk3" = "yes")
-
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-
 ######################
 # gettext i18n support
 ######################
@@ -660,7 +598,7 @@ AC_ARG_WITH(gdk_pixbuf, [  --without-gdk-pixbuf    build without gdk-pixbuf supp
 
 have_gdk_pixbuf="no"
 if test "x$with_gdk_pixbuf" != "xno"; then
-  PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
+  PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version,
     have_gdk_pixbuf="yes",
     have_gdk_pixbuf="no  (gdk-pixbuf not found)")
 fi
@@ -1072,7 +1010,6 @@ done
 dnl Disable deprecated features in maintainer mode
 if test -z "${MAINTAINER_MODE_TRUE}"; then
    GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
-   GTK_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $GTK_CFLAGS"
 fi
 
 dnl bin/node-editors/Makefile
@@ -1130,7 +1067,6 @@ Optional features:
 Optional dependencies:
   asciidoc:        $have_asciidoc
   enscript:        $have_enscript
-  GTK+:            $have_gtk
   Ruby:            $have_ruby
   Lua:             $have_lua
   Cairo:           $have_cairo
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3e95374..a8e8dec 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -18,13 +18,6 @@ all-local: $(bins)
 	$(gegl_lt_cc_v) $(LIBTOOL) --quiet --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $< 
 	$(gegl_lt_ccld_v) $(LIBTOOL) --quiet --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $  lo $(LIBS)
 
-gegl-paint: gegl-paint.c $(GEGLHEADERS)
-	$(AM_V_at) touch gegl-paint
-if HAVE_GTK
-	$(gegl_lt_cc_v) $(LIBTOOL) --quiet --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $< 
-	$(gegl_lt_ccld_v) $(LIBTOOL) --quiet --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $  lo $(LIBS)
-endif
-
 clean-local:
 	rm -f *.lo $(bins)
 
diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am
index 7c64e11..888b5c1 100644
--- a/operations/workshop/external/Makefile.am
+++ b/operations/workshop/external/Makefile.am
@@ -11,13 +11,6 @@ line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS) $(GLIB_C
 ops += line-profile.la
 endif
 
-if HAVE_GTK
-ops += gtk-display.la
-gtk_display_la_SOURCES = gtk-display.c
-gtk_display_la_LIBADD  = $(op_libs) $(GTK_LIBS)
-gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
-endif
-
 if HAVE_AVFORMAT
 ops += ff-save.la
 ff_save_la_SOURCES = ff-save.c