diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-10-28 10:30:59 +0100 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-10-28 10:30:59 +0100 |
| commit | a5865dae5b414de5f6dbda2a512101050c374e06 (patch) | |
| tree | fb41982e1592f7e907fede310890c357e8ed38d9 /configure.ac | |
| parent | e07bfb54b77430e10e50c33151cf0afc9854006c (diff) | |
[glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d99769f7..8b7ebe79 100644 --- a/configure.ac +++ b/configure.ac @@ -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], |