fix for dialog navigation in the modal dialogs: do call IsDialogMessage() in this...

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 17cb392540b21a14c4e873729b56a95e620949f0..40ce4d86419dda1b50336a63321be1ccd1c8a511 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -286,28 +286,6 @@ if test "$USE_UNIX" = 1 ; then
     AC_DEFINE(__UNIX__)
 fi
 
     AC_DEFINE(__UNIX__)
 fi
 

-dnl check for glibc version
-if test "$USE_LINUX" = 1; then
-    AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,[
-        AC_TRY_COMPILE([#include <features.h>],
-            [
-                #if !__GLIBC_PREREQ(2, 1)
-                    #error not glibc2.1
-                #endif
-            ],
-            [
-                wx_lib_glibc21=yes
-            ],
-            [
-                wx_lib_glibc21=no
-            ]
-        )
-    ])
-    if test "$wx_lib_glibc21" = "yes"; then
-        AC_DEFINE(wxHAVE_GLIBC2)
-    fi
-fi
-

 dnl ---------------------------------------------------------------------------
 dnl command line options for configure
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl command line options for configure
 dnl ---------------------------------------------------------------------------


@@ -335,8 +313,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no

-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no

   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes


@@ -509,8 +487,8 @@ else
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no

-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no

   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no


@@ -708,7 +686,7 @@ AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$wi
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])

-AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1])
+AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])

 AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])


@@ -1384,6 +1362,31 @@ dnl ------------------------------------------------------------------------
 dnl flush the cache because checking for libraries below might abort
 AC_CACHE_SAVE
 
 dnl flush the cache because checking for libraries below might abort
 AC_CACHE_SAVE
 

+dnl check for glibc version
+dnl
+dnl VZ: I have no idea why had this check been there originally, but now
+dnl     it is only used to get the recursive mutexes under Linux
+if test "$USE_LINUX" = 1; then
+    AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
+        AC_TRY_COMPILE([#include <features.h>],
+            [
+                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
+                    #error not glibc2.1
+                #endif
+            ],
+            [
+                wx_cv_lib_glibc21=yes
+            ],
+            [
+                wx_cv_lib_glibc21=no
+            ]
+        )
+    ])
+    if test "$wx_cv_lib_glibc21" = "yes"; then
+        AC_DEFINE(wxHAVE_GLIBC2)
+    fi
+fi
+

 dnl ---------------------------------------------------------------------------
 dnl Optional libraries
 dnl
 dnl ---------------------------------------------------------------------------
 dnl Optional libraries
 dnl


@@ -2062,6 +2065,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
     if test "$wxUSE_MAC" = 1; then
         if test "$wxUSE_PRECOMP" = "yes"; then
             CPPFLAGS="$CPPFLAGS -cpp-precomp"
     if test "$wxUSE_MAC" = 1; then
         if test "$wxUSE_PRECOMP" = "yes"; then
             CPPFLAGS="$CPPFLAGS -cpp-precomp"

+        else
+            CPPFLAGS="$CPPFLAGS -no-cpp-precomp"

         fi
         CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
         CFLAGS="$CFLAGS -fpascal-strings"
         fi
         CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
         CFLAGS="$CFLAGS -fpascal-strings"


@@ -2183,11 +2188,13 @@ fi
 dnl ---------------------------------------------------------------------------
 dnl OpenGL libraries
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl OpenGL libraries
 dnl ---------------------------------------------------------------------------

+

 if test "$wxUSE_OPENGL" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
 if test "$wxUSE_OPENGL" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"

+    elif test "$wxUSE_MSW" = 1; then
+        OPENGL_LIBS="-lopengl32 -lglu32"

     else
     else

-

         AC_CHECK_HEADER(GL/gl.h,
             [
                 AC_MSG_CHECKING([for -lGL])
         AC_CHECK_HEADER(GL/gl.h,
             [
                 AC_MSG_CHECKING([for -lGL])


@@ -2216,26 +2223,6 @@ if test "$wxUSE_OPENGL" = "yes"; then
                 fi
             ])
 
                 fi
             ])
 

-    dnl check for OpenGL libs availability first
-    dnl -lGL requires -lm with soem OpenGL versions
-
-#    AC_CHECK_HEADER(GL/gl.h,
-#        [
-#            AC_CHECK_LIB(GL, glFlush,
-#                [
-#                    OPENGL_LIBS="-lGL -lGLU"
-#                ],
-#                [
-#                    AC_CHECK_LIB(MesaGL, glFlush,
-#                        [
-#                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
-#                        ],
-#                        [],
-#                        [-lm])
-#                ],
-#                [-lm])
-#        ])
-

         if test "x$OPENGL_LIBS" = "x"; then
             dnl it should be an error and not a warning because OpenGL is not on
             dnl by default and so if it had been explicitely requested, we
         if test "x$OPENGL_LIBS" = "x"; then
             dnl it should be an error and not a warning because OpenGL is not on
             dnl by default and so if it had been explicitely requested, we


@@ -2292,10 +2279,6 @@ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
 WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
 WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
 
 WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
 WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
 

-dnl the name of the resources file for wxMac
-WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
-WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
-

 case "${host}" in
     *-*-cygwin* | *-*-mingw32* )
 
 case "${host}" in
     *-*-cygwin* | *-*-mingw32* )
 


@@ -2314,7 +2297,17 @@ case "${host}" in
             WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
             WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
         fi
             WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
             WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
         fi

+        ;;

 
 

+    *-*-darwin* )
+        dnl Under Mac OS X, we should build real frameworks instead of simple
+        dnl dynamic shared libraries (in order to embed the resources)
+        if test "$wxUSE_MAC" = 1; then
+            dnl the name of the resources file for wxMac
+            WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r" 
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+        fi
+        ;;

 esac
 
 dnl the name of the static library
 esac
 
 dnl the name of the static library


@@ -2429,12 +2422,13 @@ if test "$wxUSE_SHARED" = "yes"; then
       *-*-darwin* )
         dnl For Unix to MacOS X porting instructions, see:
         dnl http://fink.sourceforge.net/doc/porting/porting.html
       *-*-darwin* )
         dnl For Unix to MacOS X porting instructions, see:
         dnl http://fink.sourceforge.net/doc/porting/porting.html

-        CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
-        CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
-        dnl Executables must necessarily fully bind the wxWindows library at
-        dnl program launch otherwise lazy binding breaks RTTI class info
-        LDFLAGS="$LDFLAGS -Wl,-bind_at_load"
-        SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
+        CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
+        CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
+        dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo)
+        dnl this can be done either with the exe linker flag -Wl,-bind_at_load
+        dnl or with a double stage link in order to create a single module
+        dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
+        SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"

         PIC_FLAG="-dynamic -fPIC"
         SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
         SONAME_FLAGS_GL=${SONAME_FLAGS}
         PIC_FLAG="-dynamic -fPIC"
         SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
         SONAME_FLAGS_GL=${SONAME_FLAGS}


@@ -2521,14 +2515,21 @@ fi
 
 if test "$wxUSE_MAC" = 1; then
     dnl add the resources target for wxMac
 
 if test "$wxUSE_MAC" = 1; then
     dnl add the resources target for wxMac

-    WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+    LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+    WX_ALL="${WX_ALL} ${LIBWXMACRES}"

     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
     AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
     MACOSX_BUNDLE="bundle"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
     AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
     MACOSX_BUNDLE="bundle"

-    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
-    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
-    LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
+    if test "$wxUSE_SHARED" = "yes"; then
+        dnl resources are bundled with shared library, not with applications
+        LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
+        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
+    else
+        dnl resources are bundled with applications, not with static library
+        LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+    fi

 else
     if test "$wxUSE_PM" = 1; then
         LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
 else
     if test "$wxUSE_PM" = 1; then
         LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"


@@ -2568,6 +2569,11 @@ dnl AC_CHECK_HEADERS(wctype.h)
 
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)
 
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)

+
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+    AC_CHECK_FUNCS(fnmatch)
+fi
+

 dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
 AC_CHECK_HEADERS(langinfo.h)
 
 dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
 AC_CHECK_HEADERS(langinfo.h)
 


@@ -2593,37 +2599,6 @@ AC_TYPE_SIZE_T
 dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
 dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 

-dnl   check for wchar_t
-dnl   Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
-dnl   on Cygwin wchar.h needs stddef.h to be #included by hand
-AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
-[
-    AC_TRY_COMPILE(
-        [
-            #ifdef HAVE_WCHAR_H
-            #  ifdef __CYGWIN__
-            #    include <stddef.h>
-            #  endif
-            #  include <wchar.h>
-            #endif
-            #ifdef HAVE_STDLIB_H
-            #  include <stdlib.h>
-            #endif
-        ],
-        [
-            wchar_t wc, *ws;
-            wc = L'a';
-            ws = L"Hello, world!";
-        ],
-        wx_cv_type_wchar_t=yes,
-        wx_cv_type_wchar_t=no
-    )
-])
-
-if test "$wx_cv_type_wchar_t" = "yes"; then
-    AC_DEFINE(wxUSE_WCHAR_T)
-fi
-

 dnl check what exactly size_t is on this machine - this is necessary to avoid
 dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
 AC_LANG_SAVE
 dnl check what exactly size_t is on this machine - this is necessary to avoid
 dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
 AC_LANG_SAVE


@@ -2774,25 +2749,48 @@ dnl ---------------------------------------------------------------------------
 dnl Check for functions
 dnl ---------------------------------------------------------------------------
 
 dnl Check for functions
 dnl ---------------------------------------------------------------------------
 

-dnl check for wcslen
-AC_CHECK_LIB(c, wcslen, [
-            AC_DEFINE(HAVE_WCSLEN)
-            WCHAR_LINK=
-        ], [
-            AC_CHECK_LIB(w, wcslen, [
-                AC_DEFINE(HAVE_WCSLEN)
-                WCHAR_LINK=" -lw"
-            ], [
-                AC_CHECK_LIB(msvcrt, wcslen, [
+dnl don't check for wchar_t functions if we haven't got wchar_t itself
+WCHAR_OK=0
+if test "$wx_cv_sizeof_wchar_t" != "0"; then
+    dnl check for wcslen
+    WCHAR_LINK=
+    AC_CHECK_FUNCS(wcslen, [

                     AC_DEFINE(HAVE_WCSLEN)
                     AC_DEFINE(HAVE_WCSLEN)

-                    WCHAR_LINK=
-                ])
+                    WCHAR_OK=1
+                  ])
+
+    if test "$WCHAR_OK" = 0; then
+        if test "$TOOLKIT" = "MSW"; then
+            AC_CHECK_LIB(msvcrt, wcslen, [
+                AC_DEFINE(HAVE_WCSLEN)
+                WCHAR_OK=1

             ])
             ])

-        ])
+        else
+            AC_CHECK_LIB(w, wcslen, [
+                            AC_DEFINE(HAVE_WCSLEN)
+                            WCHAR_LINK=" -lw"
+                            WCHAR_OK=1
+                        ])
+        fi
+    fi
+fi

 
 

-dnl use wcsrtombs instead of wcstombs which is buggy in old GNU libc versions
-dnl if possible
-AC_CHECK_FUNCS(wcsrtombs)
+dnl we need at least the definition of wchar_t itself and wcslen() to compile
+dnl with wchar_t support -- turn it off if we don't have this
+if test "$WCHAR_OK" = 1; then
+    AC_DEFINE(wxUSE_WCHAR_T)
+
+    dnl also try to use wcsrtombs instead of wcstombs which is buggy in old GNU
+    dnl libc versions if possible
+    AC_CHECK_FUNCS(wcsrtombs)
+else
+    dnl use built-in wcslen for Darwin (what about other BSD based systems?)
+    if test "$USE_DARWIN" = 1; then
+        AC_DEFINE(wxUSE_WCHAR_T)
+    else
+        AC_MSG_WARN([Wide character support is unavailable])
+    fi
+fi

 
 dnl check for vprintf/vsprintf() which are GNU extensions
 AC_FUNC_VPRINTF
 
 dnl check for vprintf/vsprintf() which are GNU extensions
 AC_FUNC_VPRINTF


@@ -3180,7 +3178,11 @@ if test "$TOOLKIT" != "MSW"; then
                 dnl and finally the userland threads
                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                 ;;
                 dnl and finally the userland threads
                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                 ;;

-          *-*-aix* )
+          *-*-darwin*)
+                dnl Darwin / Mac OS X just uses -lpthread tested below
+                THREAD_OPTS=""
+                ;;
+          *-*-aix*)

                 dnl AIX calls the library libpthreads - thanks IBM!
                 THREAD_OPTS="pthreads"
                 ;;
                 dnl AIX calls the library libpthreads - thanks IBM!
                 THREAD_OPTS="pthreads"
                 ;;


@@ -3341,7 +3343,7 @@ if test "$TOOLKIT" != "MSW"; then
       dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
       dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
       dnl simpler to just define _GNU_SOURCE to get everything)
       dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
       dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
       dnl simpler to just define _GNU_SOURCE to get everything)

-      if test "x$wx_lib_glibc21" = "xyes"; then
+      if test "x$wx_cv_lib_glibc21" = "xyes"; then

           CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
       fi
 
           CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
       fi
 


@@ -3676,6 +3678,7 @@ if test "$wxUSE_DATETIME" = "yes"; then
     AC_CHECK_FUNCS(strptime)
 
     dnl check for timezone variable
     AC_CHECK_FUNCS(strptime)
 
     dnl check for timezone variable

+    dnl   doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead

     AC_CACHE_CHECK(for timezone variable in <time.h>,
                    wx_cv_var_timezone,
                    [
     AC_CACHE_CHECK(for timezone variable in <time.h>,
                    wx_cv_var_timezone,
                    [


@@ -3716,7 +3719,7 @@ if test "$wxUSE_DATETIME" = "yes"; then
                                             ],
                                             [
                                                 if test "$USE_DOS" = 0 ; then
                                             ],
                                             [
                                                 if test "$USE_DOS" = 0 ; then

-                                                    AC_MSG_ERROR(no timezone variable)
+                                                    AC_MSG_WARN(no timezone variable, will use tm_gmtoff instead)

                                                 fi
                                             ]
                                         )
                                                 fi
                                             ]
                                         )


@@ -4760,8 +4763,16 @@ fi
 
 
 dnl all -I options we must pass to the compiler
 
 
 dnl all -I options we must pass to the compiler

-INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+dnl
+dnl note that the order is somewhat important, in particular the ZLIB_INCLUDE
+dnl and other stuff for the built in libraries should come first to avoid
+dnl including the system headers with the same name (it is particularly
+dnl important for zlib because XFree 4.2.0 has its own, horribly old and
+dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
+INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
+-I\${top_srcdir}/include \
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
+$TOOLKIT_INCLUDE"

 
 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then
 
 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then


@@ -4879,6 +4890,7 @@ AC_SUBST(SAMPLES_SUBDIRS)
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDFLAGS_GL)
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDFLAGS_GL)

+AC_SUBST(LDFLAGS_EXE)

 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(DMALLOC_LIBS)
 AC_SUBST(EXTRADEFS)
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(DMALLOC_LIBS)
 AC_SUBST(EXTRADEFS)


@@ -4887,8 +4899,8 @@ dnl additional resurces settings
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
 AC_SUBST(RESPROGRAMOBJ)
 AC_SUBST(RESCOMP)
 AC_SUBST(RESFLAGS)
 AC_SUBST(RESPROGRAMOBJ)

-AC_SUBST(WX_RESOURCES_MACOSX)
-AC_SUBST(WX_RESOURCES_MACOSX_COMPILED)
+AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
+AC_SUBST(WX_RESOURCES_MACOSX_DATA)

 
 dnl additional for Mac OS X
 AC_SUBST(DEREZ)
 
 dnl additional for Mac OS X
 AC_SUBST(DEREZ)


@@ -4917,24 +4929,22 @@ fi
 
 AC_CONFIG_HEADER(setup.h:setup.h.in)
 
 
 AC_CONFIG_HEADER(setup.h:setup.h.in)
 

-dnl some more GUI only things
-if test "$wxUSE_GUI" = "yes"; then
-    dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
-    dnl samples and the only way to do it is, again, use the cache
-    wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
-    wx_cv_if_gnu_make=$IF_GNU_MAKE
-    wx_cv_path_ifs=$PATH_IFS
-    wx_cv_program_ext=$PROGRAM_EXT
-    wx_cv_target_library=$WX_TARGET_LIBRARY
-    wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
-    wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
-    dnl we need to export them because passing them through cache won't
-    dnl work when cache=/dev/null (which is default for autoconf 2.50)
-    export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
-           wx_cv_path_ifs wx_cv_program_ext \
-           wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
-    AC_CONFIG_SUBDIRS(demos samples utils contrib mobile)
-fi
+dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
+dnl samples and the only way to do it is to use the environment (another
+dnl idea could have been to use the cache but this wouldn't work when
+dnl configure doesn't use cache at all which is the default with autoconf 2.50)
+wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
+wx_cv_if_gnu_make=$IF_GNU_MAKE
+wx_cv_path_ifs=$PATH_IFS
+wx_cv_program_ext=$PROGRAM_EXT
+wx_cv_target_library=$WX_TARGET_LIBRARY
+wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
+wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
+       wx_cv_path_ifs wx_cv_program_ext \
+       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
+
+AC_CONFIG_SUBDIRS(demos samples utils contrib)

 
 dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a
 
 dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a