diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-10-28 10:01:00 +0100 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-10-28 10:01:00 +0100 |
| commit | a84d272ffd2b593ac98148e71b83fba299c60fea (patch) | |
| tree | affd471144ba219c74371b79bc0115074543908e /configure.ac | |
| parent | 43f2b84a81625abee84c93cdced7fb92c99cd944 (diff) | |
[glib] Add disable deprecated compile flags and fix compile warnings
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 7ecc0374..d99769f7 100644 --- a/configure.ac +++ b/configure.ac @@ -229,6 +229,8 @@ fi AC_SUBST(CAIRO_FEATURE) AC_SUBST(CAIRO_REQ) +POPPLER_GLIB_DISABLE_DEPRECATED="" + GLIB_REQUIRED=2.6 AC_ARG_ENABLE(poppler-glib, AC_HELP_STRING([--disable-poppler-glib], @@ -244,6 +246,7 @@ elif test x$enable_poppler_glib = xtry; then 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" fi AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes) @@ -280,6 +283,7 @@ if test x$enable_poppler_glib = xyes; then if test x$enable_gdk = 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" else GDK_FEATURE="" fi @@ -289,6 +293,8 @@ AC_SUBST(GDK_CFLAGS) AC_SUBST(GDK_LIBS) AC_SUBST(GDK_FEATURE) +AC_SUBST(POPPLER_GLIB_DISABLE_DEPRECATED) + AC_ARG_ENABLE(poppler-qt, AC_HELP_STRING([--disable-poppler-qt], [Don't compile poppler qt wrapper.]), |