Applied patch [ 800784 ] Fixes ::wxDirSelector style problem

[wxWidgets.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index fedb14b8b3fd67d635440421d6497603a69e116f..73259c5da783b0db14f1f15c03c0b80e4baba474 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1111,14 +1111,18 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
     PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOSX=0
+    PLATFORM_OS2=0
     
     case "${host}" in
         *-*-cygwin* | *-*-mingw32* )
             PLATFORM_WIN32=1
         ;;
-        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+        *-pc-msdosdjgpp )
             PLATFORM_MSDOS=1
         ;;
+        *-pc-os2_emx | *-pc-os2-emx )
+            PLATFORM_OS2=1
+        ;;
         powerpc-*-darwin* )
             PLATFORM_MAC=1
             PLATFORM_MACOSX=1
@@ -1133,6 +1137,7 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
     AC_SUBST(PLATFORM_MSDOS)
     AC_SUBST(PLATFORM_MAC)
     AC_SUBST(PLATFORM_MACOSX)
+    AC_SUBST(PLATFORM_OS2)
 ])
 
 
@@ -1149,6 +1154,7 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
     SO_SUFFIX="so"
     SO_SUFFIX_MODULE="so"
     EXEEXT=""
+    LIBPREFIX=lib
     DLLPREFIX=lib
     DLLPREFIX_MODULE=
     
@@ -1172,9 +1178,14 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
-        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+        *-pc-msdosdjgpp )
+            EXEEXT=".exe"
+            DLLPREFIX=""
+        ;;
+        *-pc-os2_emx | *-pc-os2-emx )
             EXEEXT=".exe"
             DLLPREFIX=""
+            LIBPREFIX=""
         ;;
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
@@ -1185,6 +1196,7 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
     AC_SUBST(SO_SUFFIX)
     AC_SUBST(SO_SUFFIX_MODULE)
     AC_SUBST(EXEEXT)
+    AC_SUBST(LIBPREFIX)
     AC_SUBST(DLLPREFIX)
     AC_SUBST(DLLPREFIX_MODULE)
 ])
@@ -1401,6 +1413,7 @@ EOF
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
+      *-pc-os2_emx | *-pc-os2-emx | \
       *-*-sysv5* )
         dnl defaults are ok
       ;;
@@ -1653,9 +1666,16 @@ AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS,
             AC_MSG_CHECKING([if the compiler supports precompiled headers])
             AC_TRY_COMPILE([],
                 [
-                    #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) || \
-                        (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
-                            #error "no pch support"
+                    #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+                        #error "no pch support"
+                    #endif
+                    #if (__GNUC__ < 3)
+                        #error "no pch support"
+                    #endif
+                    #if (__GNUC__ == 3) && \
+                       ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
+                       ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
+                        #error "no pch support"
                     #endif
                 ],
                 [