X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dcfc2898ed5cd603b8c1f1868a1b4d9d8e68700..120678ee96cd38c8d10ead6e60135004b8e97f9e:/configure.in

diff --git a/configure.in b/configure.in
index 3f874aac45..945d63bc17 100644
--- a/configure.in
+++ b/configure.in
@@ -840,6 +840,7 @@ 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)
 if test "$USE_OS2" = "1"; then
+    DEFAULT_wxUSE_OMF=no
     WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
 fi
 
@@ -1561,7 +1562,7 @@ case "${host}" in
       dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1
       dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5
       dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6.
-      AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[
+      AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[
           AC_TRY_RUN(
               dnl Check the gcc version macro.	 
               [
@@ -1607,9 +1608,6 @@ case "${host}" in
         wxUSE_OMF=yes
 	enable_omf=yes
       fi
-      if test "$wxUSE_OMF" = "yes"; then
-        LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
-      fi
       dnl (end of OS/2-only piece)
   ;;
   *)
@@ -3885,6 +3883,12 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     AC_LANG_RESTORE
 fi
 
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then 
+    AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled])
+    wxUSE_STACKWALKER=no
+fi
+
+
 dnl check for the function for temp files creation
 AC_CHECK_FUNCS(mkstemp mktemp, break)
 
@@ -6542,6 +6546,15 @@ else
     EXE_LINKER="$CXX -o"
 
 fi
+if test "$wxUSE_OMF" = "yes"; then
+    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
+        LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+        WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+      ;;
+    esac
+fi
 
 dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to
 dnl be in wx-config output.  Not doing so could result in link problems.