[gtk+/rendering-cleanup: 34/65] gdk: Remove unused medialib code

[Benjamin Otte <otte src gnome org>]

commit 36f901145c71a377af3d0bf6bc33c3ddb8063053
Author: Benjamin Otte <otte redhat com>
Date:   Mon Nov 22 18:24:24 2010 +0100

    gdk: Remove unused medialib code

 config.h.win32.in  |    6 ---
 configure.ac       |   22 ----------
 gdk/Makefile.am    |    9 ----
 gdk/gdkinternals.h |    3 -
 gdk/gdkmedialib.c  |  120 ----------------------------------------------------
 gdk/gdkmedialib.h  |   45 -------------------
 6 files changed, 0 insertions(+), 205 deletions(-)
---
diff --git a/config.h.win32.in b/config.h.win32.in
index dec0d03..23f0156 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -276,12 +276,6 @@
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */
 
-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
 #  define USE_MMX 1
diff --git a/configure.ac b/configure.ac
index 3ac0bec..7756478 100644
--- a/configure.ac
+++ b/configure.ac
@@ -858,28 +858,6 @@ AC_CHECK_HEADER(sys/sysinfo.h,
                 AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
                           [Define to 1 if sys/sysinfo.h is available]))
 
-AC_MSG_CHECKING(for mediaLib 2.3)
-use_mlib25=no
-# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
-# patch requires.
-AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
-if test $use_mlib = yes; then
-    AC_DEFINE(USE_MEDIALIB, 1,
-              [Define to 1 if medialib is available and should be used])
-    MEDIA_LIB=-lmlib
-
-    AC_MSG_CHECKING(for mediaLib 2.5)
-    # Check for a mediaLib 2.5 function since that is what is needed for
-    # gdk_rgb_convert integration.
-    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
-    if test $use_mlib25 = yes; then
-        AC_DEFINE(USE_MEDIALIB25, 1,
-                  [Define to 1 if medialib 2.5 is available])
-    fi
-fi
-AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
-AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
-
 dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
 
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f4606b9..2b2ae6b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST +=			\
 	gdkkeysyms-update.pl	\
 	gdk.def 		\
 	gdkmarshalers.list	\
-	gdkmedialib.h		\
 	gdkwindowimpl.h		\
 	makeenums.pl		\
 	makefile.msc		\
@@ -55,13 +54,6 @@ LDADD = \
 	$(no_undefined)							\
 	$(LIBTOOL_EXPORT_OPTIONS)
 
-if USE_MEDIALIB
-medialib_sources =  \
-    gdkmedialib.c
-else
-medialib_sources =
-endif
-
 #
 # setup source file variables
 #
@@ -111,7 +103,6 @@ gdk_private_headers =				\
 	gdkpoly-generic.h
 
 gdk_c_sources =                 \
-	$(medialib_sources)     \
 	gdk.c			\
 	gdkapplaunchcontext.c	\
 	gdkcairo.c		\
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 445c255..e115019 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -33,9 +33,6 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkprivate.h>
-#ifdef USE_MEDIALIB
-#include <gdk/gdkmedialib.h>
-#endif
 
 G_BEGIN_DECLS