Bug 1256988 - Move MOZ_PDF_PRINTING to moz.configure. r=chmanchester

Remove the AC_DEFINE because it is unused.
This commit is contained in:
Mike Hommey 2016-03-16 16:10:40 +09:00
Родитель 44442bc4fe
Коммит 9351ddacba
2 изменённых файлов: 12 добавлений и 14 удалений

Просмотреть файл

@ -3116,7 +3116,6 @@ NS_PRINTING=1
if test "$MOZ_IOS"; then if test "$MOZ_IOS"; then
NS_PRINTING= NS_PRINTING=
fi fi
MOZ_PDF_PRINTING=
MOZ_NO_SMART_CARDS= MOZ_NO_SMART_CARDS=
NSS_DISABLE_DBM= NSS_DISABLE_DBM=
NECKO_COOKIES=1 NECKO_COOKIES=1
@ -3415,21 +3414,18 @@ dnl ========================================================
case "$MOZ_WIDGET_TOOLKIT" in case "$MOZ_WIDGET_TOOLKIT" in
windows) windows)
MOZ_PDF_PRINTING=1
MOZ_INSTRUMENT_EVENT_LOOP=1 MOZ_INSTRUMENT_EVENT_LOOP=1
;; ;;
gtk3) gtk3)
USE_FC_FREETYPE=1 USE_FC_FREETYPE=1
MOZ_PDF_PRINTING=1
MOZ_INSTRUMENT_EVENT_LOOP=1 MOZ_INSTRUMENT_EVENT_LOOP=1
;; ;;
gtk2) gtk2)
USE_FC_FREETYPE=1 USE_FC_FREETYPE=1
MOZ_PDF_PRINTING=1
MOZ_INSTRUMENT_EVENT_LOOP=1 MOZ_INSTRUMENT_EVENT_LOOP=1
;; ;;
@ -3437,7 +3433,6 @@ qt)
MOZ_ENABLE_QT=1 MOZ_ENABLE_QT=1
USE_FC_FREETYPE=1 USE_FC_FREETYPE=1
MOZ_PDF_PRINTING=1
AC_DEFINE(QT_NO_KEYWORDS) AC_DEFINE(QT_NO_KEYWORDS)
;; ;;
@ -3465,25 +3460,17 @@ uikit)
;; ;;
android) android)
MOZ_PDF_PRINTING=1
MOZ_INSTRUMENT_EVENT_LOOP=1 MOZ_INSTRUMENT_EVENT_LOOP=1
;; ;;
gonk) gonk)
AC_DEFINE(MOZ_TOUCH) AC_DEFINE(MOZ_TOUCH)
MOZ_PDF_PRINTING=1
MOZ_TOUCH=1 MOZ_TOUCH=1
MOZ_INSTRUMENT_EVENT_LOOP=1 MOZ_INSTRUMENT_EVENT_LOOP=1
;; ;;
esac esac
AC_SUBST(MOZ_PDF_PRINTING)
if test "$MOZ_PDF_PRINTING"; then
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
AC_DEFINE(MOZ_PDF_PRINTING)
fi
if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP) AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
fi fi
@ -7355,7 +7342,6 @@ if test "$MOZ_TREE_CAIRO"; then
AC_SUBST(MOZ_ENABLE_D3D10_LAYER) AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
AC_SUBST(PS_SURFACE_FEATURE) AC_SUBST(PS_SURFACE_FEATURE)
AC_SUBST(PDF_SURFACE_FEATURE)
AC_SUBST(SVG_SURFACE_FEATURE) AC_SUBST(SVG_SURFACE_FEATURE)
AC_SUBST(XLIB_SURFACE_FEATURE) AC_SUBST(XLIB_SURFACE_FEATURE)
AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE) AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE)

Просмотреть файл

@ -108,3 +108,15 @@ def gl_provider(value, x11):
elif x11: elif x11:
set_config('MOZ_GL_DEFAULT_PROVIDER', 'GLX') set_config('MOZ_GL_DEFAULT_PROVIDER', 'GLX')
set_define('GL_PROVIDER_GLX', '1') set_define('GL_PROVIDER_GLX', '1')
# PDF printing
# ==============================================================
@depends(toolkit)
def pdf_printing(toolkit):
if toolkit in ('windows', 'gtk2', 'gtk3', 'qt', 'android', 'gonk'):
set_config('MOZ_PDF_PRINTING', '1')
set_config('PDF_SURFACE_FEATURE', '#define CAIRO_HAS_PDF_SURFACE 1')
else:
# CONFIGURE_SUBST_FILES need explicit empty values.
set_config('PDF_SURFACE_FEATURE', '')