X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a4f0015e463860c22e3fc69bce8cfa68dd96bf6..956797563c9219995aaa5031afaaf7107af3bf2c:/configure.in?ds=sidebyside

diff --git a/configure.in b/configure.in
index af94a4cd6d..e270a59fa4 100644
--- a/configure.in
+++ b/configure.in
@@ -641,6 +641,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
@@ -802,6 +803,7 @@ else
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
@@ -1011,6 +1013,9 @@ WX_ARG_ENABLE(soname,      [  --enable-soname         set the DT_SONAME field in
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 
+dnl allow the precompiled header option to be disabled under Mac OS X
+WX_ARG_ENABLE(precomp,     [  --enable-precomp        enable use of precompiled headers (Mac OS X)], wxUSE_PRECOMP)
+
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -1948,14 +1953,16 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         GUIDIST=MOTIF_DIST
     fi
 
-    dnl we can't call this MAC_DIST or autoconf thinks its a macro
     if test "$wxUSE_MAC" = 1; then
-        CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        if test "$wxUSE_PRECOMP" = "yes"; then
+            CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        fi
         CFLAGS="${CFLAGS} -fpascal-strings"
         CXXFLAGS="${CXXFLAGS} -fpascal-strings"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
 
         TOOLKIT=MAC
+        dnl we can't call this MAC_DIST or autoconf thinks its a macro
         GUIDIST=MACX_DIST
     fi
 
@@ -1975,10 +1982,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
     PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        dnl FIXME this should not be a permanent state of affairs.
-        wxUSE_MDI_ARCHITECTURE=no
-        AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabling)
-
         ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
         PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
         TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
@@ -3830,8 +3833,15 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
+        wxUSE_MDI_ARCHITECTURE=no
+    fi
+
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    fi
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
@@ -3853,7 +3863,7 @@ if test "$wxUSE_HELP" = "yes"; then
                 AC_DEFINE(wxUSE_MS_HTML_HELP)
             ],
             [
-                AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h, disabled])
+                AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
                 wxUSE_MS_HTML_HELP=no
             ])
       fi
@@ -4164,8 +4174,8 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Toggle button is not yet supported under Mac OS X])
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
         wxUSE_TOGGLEBTN=no
     fi
 
@@ -4431,10 +4441,6 @@ if test "$wxUSE_GUI" = "yes"; then
                      drawing dynamic erase event exec font image \
                      minimal richedit rotate widgets"
 
-    if test "$wxUSE_UNIVERSAL" = "yes" ; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
-    fi
-
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else