[poppler] 2 commits - cmake/modules config.h.cmake glib/reference Makefile.am

[Pino Toscano]

 Makefile.am                         |    4 ----
 cmake/modules/FindGDK.cmake         |   22 ----------------------
 config.h.cmake                      |    3 ---
 glib/reference/Makefile.am          |    1 -
 glib/reference/poppler-sections.txt |    1 -
 5 files changed, 31 deletions(-)

New commits:
commit 728c022cdc1ea12aa54077d44276f9d7714930d4
Author: Pino Toscano <pino at kde.org>
Date:   Sun Feb 13 13:25:51 2011 +0100

    remove more references to the qt3 frontend
    
    followup of d82f98a274bfa008c218e265a080c4af7ce95131

diff --git a/Makefile.am b/Makefile.am
index e4d8e3c..c8f3556 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,6 @@ pkgconfig_DATA =				\
 	$(cairo_pc_file)			\
 	$(splash_pc_file)			\
 	$(glib_pc_file)				\
-	$(qt_pc_file)                           \
 	$(qt4_pc_file)				\
 	$(cpp_pc_file)
 
@@ -63,7 +62,6 @@ EXTRA_DIST +=							\
 	glib/demo/CMakeLists.txt				\
 	glib/CMakeLists.txt					\
 	glib/poppler-features.h.cmake				\
-	qt/CMakeLists.txt					\
 	qt4/src/CMakeLists.txt					\
 	qt4/tests/CMakeLists.txt				\
 	qt4/CMakeLists.txt					\
@@ -94,7 +92,6 @@ EXTRA_DIST +=							\
 	poppler/poppler-config.h.cmake				\
 	poppler-cpp.pc.cmake					\
 	poppler-glib.pc.cmake					\
-	poppler-qt.pc.cmake					\
 	poppler-qt4.pc.cmake					\
 	poppler-splash.pc.cmake					\
 	poppler.pc.cmake
commit 15e5b3f16015361754fdc14da4a0dde5af887568
Author: Pino Toscano <pino at kde.org>
Date:   Sun Feb 13 13:23:06 2011 +0100

    remove more GDK-related stuff
    
    followup of 149b7fec472beda9d1538e0f26607c9498d504c2

diff --git a/Makefile.am b/Makefile.am
index 768a93b..e4d8e3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,6 @@ EXTRA_DIST +=							\
 	cmake/modules/COPYING-CMAKE-SCRIPTS			\
 	cmake/modules/FindCairo.cmake				\
 	cmake/modules/FindFontconfig.cmake			\
-	cmake/modules/FindGDK.cmake				\
 	cmake/modules/FindGLIB.cmake				\
 	cmake/modules/FindGObjectIntrospection.cmake		\
 	cmake/modules/FindGTK.cmake				\
diff --git a/cmake/modules/FindGDK.cmake b/cmake/modules/FindGDK.cmake
deleted file mode 100644
index cd642cf..0000000
--- a/cmake/modules/FindGDK.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# - try to find GDK libraries
-# Once done this will define
-#
-#  GDK_FOUND - system has GDK
-#  GDK2_CFLAGS - the GDK CFlags
-#  GDK2_LIBRARIES - Link these to use GDK
-#
-# Copyright 2008-2010 Pino Toscano, <pino at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindPackageHandleStandardArgs)
-
-if (NOT WIN32)
-  find_package(PkgConfig REQUIRED)
-
-  pkg_check_modules(GDK2 "gdk-2.0")
-
-  find_package_handle_standard_args(GDK DEFAULT_MSG GDK2_LIBRARIES GDK2_CFLAGS)
-
-endif(NOT WIN32)
diff --git a/config.h.cmake b/config.h.cmake
index 71f18a3..cae2e71 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -165,9 +165,6 @@
 /* Support for curl based doc builder is compiled in. */
 #cmakedefine POPPLER_HAS_CURL_SUPPORT 1
 
-/* Have GDK */
-#cmakedefine POPPLER_WITH_GDK 1
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index 61955c7..f9064b0 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -70,7 +70,6 @@ expand_content_files=
 INCLUDES=-I$(top_srcdir)/glib -I$(top_builddir)/glib	\
 	$(CAIRO_CFLAGS)					\
 	$(POPPLER_GLIB_CFLAGS)				\
-	$(GDK_CFLAGS)					\
 	$(FREETYPE_CFLAGS)
 
 GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index 6ad9ee2..525dcb5 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -522,7 +522,6 @@ poppler_movie_get_type
 <SECTION>
 <FILE>poppler-features</FILE>
 POPPLER_HAS_CAIRO
-POPPLER_WITH_GDK
 POPPLER_MAJOR_VERSION
 POPPLER_MINOR_VERSION
 POPPLER_MICRO_VERSION