From 0295153cbc236a8809b2a066b8c0a12648ca1ff4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Jul 2007 13:09:57 +0000 Subject: [PATCH] added --enable-ps-in-msw configure option git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++- configure.in | 5 +++++ setup.h.in | 5 ----- 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/configure b/configure index c1dc662a10..eb91305089 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47615 2007-07-21 12:56:22Z VZ . +# From configure.in Id: configure.in 47617 2007-07-21 13:01:28Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -1847,6 +1847,7 @@ Optional Features: --enable-xpm use xpm images (XPM file format) --enable-icocur use Windows ICO and CUR formats --enable-dccache cache temporary wxDC objects (Win32 only) + --enable-ps-in-msw use PS printing in wxMSW (Win32 only) --enable-regkey use wxRegKey class (Win32 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) @@ -15294,6 +15295,59 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; } + # Check whether --enable-ps-in-msw was given. +if test "${enable_ps_in_msw+set}" = set; then + enableval=$enable_ps_in_msw; + if test "$enableval" = yes; then + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' + else + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" + +fi + + + eval "$wx_cv_use_ps_in_msw" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -48651,6 +48705,13 @@ _ACEOF fi +if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +_ACEOF + +fi + if test "$wxUSE_UXTHEME" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_UXTHEME 1 diff --git a/configure.in b/configure.in index 15bee10088..6f43c592a8 100644 --- a/configure.in +++ b/configure.in @@ -896,6 +896,7 @@ dnl wxMSW-only options dnl --------------------------------------------------------------------------- WX_ARG_FEATURE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING) +WX_ARG_FEATURE(ps-in-msw, [ --enable-ps-in-msw use PS printing in wxMSW (Win32 only)], wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY) WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME) WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB) @@ -7060,6 +7061,10 @@ if test "$wxUSE_REGKEY" = "yes"; then AC_DEFINE(wxUSE_REGKEY) fi +if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) +fi + if test "$wxUSE_UXTHEME" = "yes"; then AC_DEFINE(wxUSE_UXTHEME) fi diff --git a/setup.h.in b/setup.h.in index a8efefe3d9..7d5121a0a5 100644 --- a/setup.h.in +++ b/setup.h.in @@ -1204,11 +1204,6 @@ with wx/msw/setup.h */ #define wxUSE_XPM_IN_MSW wxUSE_XPM -/* Set to 0 to disable PostScript print/preview architecture code under Windows - (just use Windows printing). - */ -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - /* When using an external jpeg library and the Windows headers already define * boolean, define to the type used by the jpeg library for boolean. */ #undef wxHACK_BOOLEAN -- 2.45.2