Commit a5865dae authored by Carlos Garcia Campos's avatar Carlos Garcia Campos

[glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo

parent e07bfb54
......@@ -230,6 +230,7 @@ AC_SUBST(CAIRO_FEATURE)
AC_SUBST(CAIRO_REQ)
POPPLER_GLIB_DISABLE_DEPRECATED=""
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
GLIB_REQUIRED=2.6
AC_ARG_ENABLE(poppler-glib,
......@@ -247,6 +248,7 @@ fi
if test x$enable_poppler_glib = xyes; then
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
fi
AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
......@@ -284,6 +286,7 @@ if test x$enable_poppler_glib = xyes; then
AC_DEFINE(POPPLER_WITH_GDK,[1], [Have GDK])
GDK_FEATURE="#define POPPLER_WITH_GDK 1"
POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
else
GDK_FEATURE=""
fi
......@@ -294,6 +297,7 @@ AC_SUBST(GDK_LIBS)
AC_SUBST(GDK_FEATURE)
AC_SUBST(POPPLER_GLIB_DISABLE_DEPRECATED)
AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
AC_ARG_ENABLE(poppler-qt,
AC_HELP_STRING([--disable-poppler-qt],
......
......@@ -20,7 +20,8 @@ INCLUDES = \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
$(cairo_includes) \
$(POPPLER_GLIB_DISABLE_DEPRECATED)
$(POPPLER_GLIB_DISABLE_DEPRECATED) \
$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
stamp_files = stamp-poppler-enums.h
......
......@@ -3,7 +3,8 @@ INCLUDES = \
-I$(top_builddir)/glib \
$(GTK_TEST_CFLAGS) \
$(POPPLER_GLIB_DISABLE_DEPRECATED) \
-DGTK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED \
$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
if BUILD_GTK_TEST
noinst_PROGRAMS = poppler-glib-demo
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _ANNOTS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _ATTACHMENTS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _FONTS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _FORMS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _IMAGES_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _INFO_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _LINKS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _OUTLINE_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _PAGE_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _RENDER_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _TRANSITIONS_H_
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <poppler.h>
#ifndef _UTILS_H_
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment