From: Václav Slavík Date: Mon, 14 Jul 2003 14:57:43 +0000 (+0000) Subject: removed --enable-precomp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/19c261dc84e09eed5d3b9f41cd175f192c7b4f01?ds=inline removed --enable-precomp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index 0826106d8b..801e4e07dc 100755 --- a/configure +++ b/configure @@ -874,7 +874,6 @@ Optional Features: --enable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-stl use STL for containers - --enable-precomp enable use of precompiled headers (Mac OS X/Darwin) --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information --enable-debug_gdb create code with extra GDB debugging information @@ -1957,7 +1956,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes @@ -2132,7 +2130,6 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes @@ -3175,48 +3172,6 @@ echo "${ECHO_T}no" >&6 fi - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-precomp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-precomp... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-precomp or --disable-precomp was given. -if test "${enable_precomp+set}" = set; then - enableval="$enable_precomp" - - if test "$enableval" = yes; then - ac_cv_use_precomp='wxUSE_PRECOMP=yes' - else - ac_cv_use_precomp='wxUSE_PRECOMP=no' - fi - -else - - LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP - -fi; - - eval "$ac_cv_use_precomp" - if test "$no_cache" != 1; then - echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_PRECOMP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -6554,15 +6509,7 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAGIMAGE=no - DEFAULT_wxUSE_FINDREPLDLG=no - DEFAULT_wxUSE_FONTDLG=no - DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_WIZARDDLG=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STARTUP_TIPS=no fi @@ -19445,14 +19392,6 @@ _ACEOF WIN32INSTALL=win32install fi -if test "$USE_DARWIN" = 1; then - if test "$wxUSE_PRECOMP" = "yes"; then - CPPFLAGS="$CPPFLAGS -cpp-precomp" - else - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" - fi -fi - if test "$wxUSE_GUI" = "yes"; then USE_GUI=1 diff --git a/configure.in b/configure.in index 9b9378a228..57fb380611 100644 --- a/configure.in +++ b/configure.in @@ -349,7 +349,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes @@ -524,7 +523,6 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes @@ -748,9 +746,6 @@ WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wx WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) -dnl allow the precompiled header option to be disabled under Mac OS X/Darwin -WX_ARG_ENABLE(precomp, [ --enable-precomp enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP) - if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -2126,16 +2121,6 @@ if test "$USE_WIN32" = 1 ; then WIN32INSTALL=win32install fi -if test "$USE_DARWIN" = 1; then - dnl Mac OS X/Darwin GCC uses precompiled headers by default - dnl this can cause problems both when compiling wxMac and wxBase - if test "$wxUSE_PRECOMP" = "yes"; then - CPPFLAGS="$CPPFLAGS -cpp-precomp" - else - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" - fi -fi - if test "$wxUSE_GUI" = "yes"; then USE_GUI=1