Tried a test for the RTTI options of GCC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
f803d8644d
commit
c11584af00
17
configure.in
17
configure.in
@ -285,6 +285,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
|
||||
DEFAULT_wxUSE_COMMONDLGS=no
|
||||
DEFAULT_wxUSE_DIRDLG=no
|
||||
DEFAULT_wxUSE_TEXTDLG=no
|
||||
DEFAULT_wxUSE_PROGRESSDLG=no
|
||||
DEFAULT_wxUSE_MINIFRAME=no
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
@ -379,6 +380,7 @@ else
|
||||
|
||||
DEFAULT_wxUSE_COMMONDLGS=yes
|
||||
DEFAULT_wxUSE_DIRDLG=yes
|
||||
DEFAULT_wxUSE_TEXTDLG=yes
|
||||
DEFAULT_wxUSE_PROGRESSDLG=yes
|
||||
DEFAULT_wxUSE_MINIFRAME=yes
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
@ -658,6 +660,7 @@ dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_ENABLE(commondlg, [ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS)
|
||||
WX_ARG_ENABLE(dirdlg, [ --enable-dirdlg use wxDirDialog], wxUSE_DIRDLG)
|
||||
WX_ARG_ENABLE(textdlg, [ --enable-textdlg use wxTextDialog], wxUSE_TEXTDLG)
|
||||
WX_ARG_ENABLE(progressdlg, [ --enable-progressdlg use wxProgressDialog], wxUSE_PROGRESSDLG)
|
||||
WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME)
|
||||
WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS)
|
||||
@ -1383,7 +1386,15 @@ if test "$wxUSE_OPTIMISE" = "no" ; then
|
||||
else
|
||||
if test "$GCC" = yes ; then
|
||||
OPTIMISE="-O2"
|
||||
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti -fno-exceptions"
|
||||
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
|
||||
AC_TRY_COMPILE(
|
||||
[], [int some_variable = 0;],
|
||||
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti -fno-exceptions",
|
||||
)
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
case "${host}" in
|
||||
i586-*-*|i686-*-* )
|
||||
OPTIMISE="${OPTIMISE} "
|
||||
@ -1934,6 +1945,10 @@ if test "$wxUSE_DIRDLG" = "yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TEXTDLG" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TEXTDLG)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_PROGRESSDLG" = "yes"; then
|
||||
if test "$wxUSE_CONSTRAINTS" != "yes"; then
|
||||
AC_MSG_WARN(wxProgressDialog requires constraints so it won't be compiled without them)
|
||||
|
Loading…
Reference in New Issue
Block a user