corrected WXDLLIMPEXP_ declaration for wxEventBlocker: it's part of core, not base

[wxWidgets.git] / build / aclocal / bakefile-lang.m4

diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
index 816526f18848179b514436e5cf7fb2d0dd03c2db..9f810d1ba54ba296e30e48f3a433a43dc41d02f1 100644 (file)
--- a/build/aclocal/bakefile-lang.m4
+++ b/build/aclocal/bakefile-lang.m4
@@ -42,14 +42,14 @@ AC_LANG_POP(C++)
 dnl Based on autoconf _AC_LANG_COMPILER_GNU
 AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
 [AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
-    [wx_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
+    [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
     [AC_TRY_COMPILE([],[#ifndef __xlC__
        choke me
 #endif
 ],
-        [wx_compiler_xlc=yes],
-        [wx_compiler_xlc=no])
-    wx_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$wx_compiler_xlc
+        [bakefile_compiler_xlc=yes],
+        [bakefile_compiler_xlc=no])
+    bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
     ])
 ])
 
@@ -57,7 +57,7 @@ dnl Loosely based on autoconf AC_PROG_CC
 AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
 [AC_LANG_PUSH(C)
 _AC_BAKEFILE_LANG_COMPILER_XLC
-XLCC=`test $wx_cv_c_compiler_xlc = yes && echo yes`
+XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C)
 ])
 
@@ -65,7 +65,7 @@ dnl Loosely based on autoconf AC_PROG_CXX
 AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
 [AC_LANG_PUSH(C++)
 _AC_BAKEFILE_LANG_COMPILER_XLC
-XLCXX=`test $wx_cv_cxx_compiler_xlc = yes && echo yes`
+XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
 AC_LANG_POP(C++)
 ])
 
@@ -89,12 +89,12 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
          )
         ]
     )
-    AC_LANG_POP($2)
     if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
         :; $4
     else
         :; $5
     fi
+    AC_LANG_POP($2)
 ])
 
 dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
@@ -144,13 +144,24 @@ AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
     _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
 ])
 
+dnl Tru64 cc and cxx
+AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
+[
+    _AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
+[
+    _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
+])
+
 dnl ===========================================================================
 dnl macros to detect specialty compiler options
 dnl ===========================================================================
 
 dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
 AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
-[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], wx_cv_[]_AC_LANG_ABBREV[]_exto,
+[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
 dnl First create an empty conf test
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
 dnl Now remove .o and .c.o or .cc.o
@@ -161,7 +172,7 @@ dnl If the test succeeded look for conftest.c.o or conftest.cc.o
 [for ac_file in `(ls conftest.* 2>/dev/null)`; do
     case $ac_file in
         conftest.$ac_ext.o)
-            wx_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
+            bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
             ;;
         *)
             ;;
@@ -173,12 +184,12 @@ done],
 rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
 ]) dnl AC_CACHE_CHECK
 
-if test "x$wx_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
+if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
     if test "[]_AC_LANG_ABBREV[]" = "c"; then
-        CFLAGS="$wx_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
+        CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
     fi
     if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
-        CXXFLAGS="$wx_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
+        CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
     fi
 fi
 ]) dnl AC_DEFUN
@@ -198,7 +209,7 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
     if test "x$G$1" != "xyes"; then
         if test "x$1" = "xC"; then
             AC_BAKEFILE_METROWERKS_EXTO
-            if test "x$wx_cv_c_exto" '!=' "x"; then
+            if test "x$bakefile_cv_c_exto" '!=' "x"; then
                 unset ac_cv_prog_cc_g
                 _AC_PROG_CC_G
             fi
@@ -220,13 +231,17 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
                 AC_BAKEFILE_PROG_SGI$1
                 ;;
 
-            SunOS)
-                AC_BAKEFILE_PROG_SUN$1
-                ;;
-
             HP-UX*)
                 AC_BAKEFILE_PROG_HP$1
                 ;;
+
+            OSF1)
+                AC_BAKEFILE_PROG_COMPAQ$1
+                ;;
+
+            SunOS)
+                AC_BAKEFILE_PROG_SUN$1
+                ;;
         esac
     fi
 ])