From b3482afb556e64beb2e56d68713fe4f4c4d6b3ea Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 27 Jul 2007 16:45:13 +0000 Subject: [PATCH] fix last commit, it seems spaces are not allowed between macro and paren git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 32 ++++++++++++++++---------------- configure.in | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 150196ad35..0c24136b51 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47742 2007-07-27 03:38:33Z DE . +# From configure.in Id: configure.in 47747 2007-07-27 14:57:31Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -1847,7 +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-iniconf use wxIniConfig (Win32 only) --enable-ps-in-msw use PS printing in wxMSW (Win32 only) --enable-ownerdrawn use owner drawn controls (Win32 only) --enable-regkey use wxRegKey class (Win32 only) @@ -15592,49 +15592,49 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-... $ECHO_C" >&6; } - # Check whether --enable- was given. -if test "${enable_+set}" = set; then - enableval=$enable_; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; } + # Check whether --enable-iniconf was given. +if test "${enable_iniconf+set}" = set; then + enableval=$enable_iniconf; if test "$enableval" = yes; then - wx_cv_use_='=yes' + wx_cv_use_iniconf='wxUSE_INICONF=yes' else - wx_cv_use_='=no' + wx_cv_use_iniconf='wxUSE_INICONF=no' fi cache=yes else cache=no - LINE=`grep "^=" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" fi - wx_cv_use_='=${'DEFAULT_":-$defaultval}" + wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" fi - eval "$wx_cv_use_" + eval "$wx_cv_use_iniconf" if test "x$cache" = xyes; then - echo "=$" >> ${wx_arg_cache_file}.tmp + echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then - if test $ = yes; then + if test $wxUSE_INICONF = yes; then result=no else result=yes fi else - result=$ + result=$wxUSE_INICONF fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } - (iniconf, --enable-iniconf use wxIniConfig (Win32 only), wxUSE_INICONF) + enablestring= defaultval=$wxUSE_ALL_FEATURES diff --git a/configure.in b/configure.in index 36a6f3da8a..63e43bd6d7 100644 --- a/configure.in +++ b/configure.in @@ -934,7 +934,7 @@ dnl wxMSW-only options dnl --------------------------------------------------------------------------- WX_ARG_FEATURE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING) -WX_ARG_ENABLE (iniconf, [ --enable-iniconf use wxIniConfig (Win32 only)], wxUSE_INICONF) +WX_ARG_ENABLE(iniconf, [ --enable-iniconf use wxIniConfig (Win32 only)], wxUSE_INICONF) 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(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 only)], wxUSE_OWNER_DRAWN) WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)