Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

--enable-iniconf and --enable-regkey aren't GUI-only options

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 15:11:12 +00:00
parent 0d4ba4ef64
commit 91a5e00c75
2 changed files with 177 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 47942 2007-08-07 22:29:07Z VZ .
# From configure.in Id: configure.in 48174 2007-08-19 10:16:30Z VS .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -1730,6 +1730,8 @@ Optional Features:
--enable-protocol-ftp FTP support in wxProtocol
--enable-protocol-file FILE support in wxProtocol
--enable-threads use threads
--enable-iniconf use wxIniConfig (Win32 only)
--enable-regkey use wxRegKey class (Win32 only)
--enable-docview use document view architecture
--enable-help use help subsystem
--enable-mshtmlhelp use MS HTML Help (win32)
@@ -1847,10 +1849,8 @@ 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)
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
--enable-wxdib use wxDIB class (Win32 only)
--disable-largefile omit support for large files
@@ -9360,6 +9360,119 @@ fi
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=
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}-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_iniconf='wxUSE_INICONF=yes'
else
wx_cv_use_iniconf='wxUSE_INICONF=no'
fi
cache=yes
else
LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
cache=yes
else
cache=no
fi
wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
fi
eval "$wx_cv_use_iniconf"
if test "x$cache" = xyes; then
echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_INICONF = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_INICONF
fi
{ echo "$as_me:$LINENO: result: $result" >&5
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}-regkey" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
# Check whether --enable-regkey was given.
if test "${enable_regkey+set}" = set; then
enableval=$enable_regkey;
if test "$enableval" = yes; then
wx_cv_use_regkey='wxUSE_REGKEY=yes'
else
wx_cv_use_regkey='wxUSE_REGKEY=no'
fi
cache=yes
else
LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
cache=yes
else
cache=no
fi
wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
fi
eval "$wx_cv_use_regkey"
if test "x$cache" = xyes; then
echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_REGKEY = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_REGKEY
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
if test "$wxUSE_GUI" = "yes"; then
@@ -16038,62 +16151,6 @@ fi
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=
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}-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_iniconf='wxUSE_INICONF=yes'
else
wx_cv_use_iniconf='wxUSE_INICONF=no'
fi
cache=yes
else
LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
cache=yes
else
cache=no
fi
wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
fi
eval "$wx_cv_use_iniconf"
if test "x$cache" = xyes; then
echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_INICONF = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_INICONF
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@@ -16206,62 +16263,6 @@ 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}-regkey" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
# Check whether --enable-regkey was given.
if test "${enable_regkey+set}" = set; then
enableval=$enable_regkey;
if test "$enableval" = yes; then
wx_cv_use_regkey='wxUSE_REGKEY=yes'
else
wx_cv_use_regkey='wxUSE_REGKEY=no'
fi
cache=yes
else
LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
cache=yes
else
cache=no
fi
wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
fi
eval "$wx_cv_use_regkey"
if test "x$cache" = xyes; then
echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_REGKEY = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_REGKEY
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@@ -48946,55 +48947,58 @@ fi
if test "$wxUSE_MSW" = 1 ; then
if test "$wxUSE_DC_CACHEING" = "yes"; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_DC_CACHEING" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DC_CACHEING 1
_ACEOF
fi
fi
if test "$wxUSE_INICONF" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_INICONF 1
_ACEOF
fi
if test "$wxUSE_DIB" = "yes"; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_DIB" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WXDIB 1
_ACEOF
fi
fi
if test "$wxUSE_OWNER_DRAWN" = "yes"; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_OWNER_DRAWN" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_OWNER_DRAWN 1
_ACEOF
fi
fi
if test "$wxUSE_REGKEY" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_REGKEY 1
_ACEOF
fi
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
_ACEOF
fi
fi
if test "$wxUSE_UXTHEME" = "yes"; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_UXTHEME" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_UXTHEME 1
_ACEOF
fi
fi
if test "$USE_WIN32" = 1 ; then
if test "$wxUSE_INICONF" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_INICONF 1
_ACEOF
fi
if test "$wxUSE_REGKEY" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_REGKEY 1
_ACEOF
fi
fi

55
configure.in
View File

@@ -667,6 +667,9 @@ WX_ARG_FEATURE(protocol_file, [ --enable-protocol-file FILE support in wxProto
WX_ARG_FEATURE(threads, [ --enable-threads use threads], wxUSE_THREADS)
WX_ARG_ENABLE(iniconf, [ --enable-iniconf use wxIniConfig (Win32 only)], wxUSE_INICONF)
WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)
if test "$wxUSE_GUI" = "yes"; then
dnl ---------------------------------------------------------------------------
@@ -934,10 +937,8 @@ 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_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)
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)
@@ -7057,36 +7058,40 @@ dnl ---------------------------------------------------------------------------
if test "$wxUSE_MSW" = 1 ; then
if test "$wxUSE_DC_CACHEING" = "yes"; then
AC_DEFINE(wxUSE_DC_CACHEING)
fi
if test "$wxUSE_DC_CACHEING" = "yes"; then
AC_DEFINE(wxUSE_DC_CACHEING)
fi
if test "$wxUSE_INICONF" = "yes"; then
AC_DEFINE(wxUSE_INICONF)
fi
if test "$wxUSE_DIB" = "yes"; then
AC_DEFINE(wxUSE_WXDIB)
fi
if test "$wxUSE_DIB" = "yes"; then
AC_DEFINE(wxUSE_WXDIB)
fi
if test "$wxUSE_OWNER_DRAWN" = "yes"; then
AC_DEFINE(wxUSE_OWNER_DRAWN)
fi
if test "$wxUSE_OWNER_DRAWN" = "yes"; then
AC_DEFINE(wxUSE_OWNER_DRAWN)
fi
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
fi
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
if test "$wxUSE_UXTHEME" = "yes"; then
AC_DEFINE(wxUSE_UXTHEME)
fi
fi
dnl wxUSE_MSW = 1
if test "$USE_WIN32" = 1 ; then
if test "$wxUSE_INICONF" = "yes"; then
AC_DEFINE(wxUSE_INICONF)
fi
if test "$wxUSE_REGKEY" = "yes"; then
AC_DEFINE(wxUSE_REGKEY)
fi
fi
dnl USE_WIN32 = 1
dnl ---------------------------------------------------------------------------
dnl wxGraphicsContext