Updated email address

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index f27abb2b2fd904c39979580e914ff6bc249b237d..7489c559638df98926be0cbdf5a961cecff854be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -391,6 +391,7 @@ USE_SUN=
 USE_SOLARIS=
 USE_SUNOS=
 USE_ALPHA=
 USE_SOLARIS=
 USE_SUNOS=
 USE_ALPHA=

+USE_IA64=

 USE_OSF=
 USE_BSD=
 USE_DARWIN=
 USE_OSF=
 USE_BSD=
 USE_DARWIN=


@@ -457,6 +458,10 @@ case "${host}" in
       USE_ALPHA=1
       AC_DEFINE(__ALPHA__)
     fi
       USE_ALPHA=1
       AC_DEFINE(__ALPHA__)
     fi

+    if test "x$TMP" = "xia64"; then
+      USE_IA64=1
+      AC_DEFINE(__IA64__)
+    fi

     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-irix5* | *-*-irix6* )
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-irix5* | *-*-irix6* )


@@ -641,6 +646,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   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
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes


@@ -802,6 +808,7 @@ else
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   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
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes


@@ -1002,10 +1009,6 @@ WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 

-dnl ====================
-dnl compile-time options
-dnl ====================
-

 dnl ---------------------------------------------------------------------------
 dnl compile options
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl compile options
 dnl ---------------------------------------------------------------------------


@@ -1015,6 +1018,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)
 
 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
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes


@@ -1952,14 +1958,18 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         GUIDIST=MOTIF_DIST
     fi
 
         GUIDIST=MOTIF_DIST
     fi
 

-    dnl we can't call this MAC_DIST or autoconf thinks its a macro

     if test "$wxUSE_MAC" = 1; then
     if test "$wxUSE_MAC" = 1; then

-        CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        if test "$wxUSE_PRECOMP" = "yes"; then
+            CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        fi
+       CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"

         CFLAGS="${CFLAGS} -fpascal-strings"
         CXXFLAGS="${CXXFLAGS} -fpascal-strings"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
 
         CFLAGS="${CFLAGS} -fpascal-strings"
         CXXFLAGS="${CXXFLAGS} -fpascal-strings"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
 

+        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"

         TOOLKIT=MAC
         TOOLKIT=MAC

+        dnl we can't call this MAC_DIST or autoconf thinks its a macro

         GUIDIST=MACX_DIST
     fi
 
         GUIDIST=MACX_DIST
     fi
 


@@ -2316,8 +2326,14 @@ dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
 
 dnl Check for headers
 dnl ------------------------------------------------------------------------
 

-dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
-AC_CHECK_HEADERS(strings.h)
+dnl do not check for strings.h for wxMac
+dnl   it exists but is only a simple redirection to string.h
+dnl   it is in conflict with Strings.h in FlatCarbon headers
+if test "$wxUSE_MAC" != 1; then
+  dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
+  AC_CHECK_HEADERS(strings.h)
+fi
+

 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
 dnl defines HAVE_UNISTD_H
 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
 dnl defines HAVE_UNISTD_H


@@ -3830,8 +3846,15 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "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
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then


@@ -3853,7 +3876,7 @@ if test "$wxUSE_HELP" = "yes"; then
                 AC_DEFINE(wxUSE_MS_HTML_HELP)
             ],
             [
                 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
                 wxUSE_MS_HTML_HELP=no
             ])
       fi


@@ -4164,8 +4187,8 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "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
 
         wxUSE_TOGGLEBTN=no
     fi
 


@@ -4431,10 +4454,6 @@ if test "$wxUSE_GUI" = "yes"; then
                      drawing dynamic erase event exec font image \
                      minimal richedit rotate widgets"
 
                      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
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else