Build fix for wxTheApp usage.

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

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index be50aa5d17f9e25b95c9346488cb732b8deb25db..375adfaf82e80c4b0c52dfd94d1f1a41b37f2a99 100644 (file)
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -309,15 +309,18 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-darwin* )
       ;;
 
       *-*-darwin* )

+        AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH
+        chmod +x shared-ld-sh
+
+        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
+        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+

         dnl Most apps benefit from being fully binded (its faster and static
         dnl variables initialized at startup work).
         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
 
         dnl Most apps benefit from being fully binded (its faster and static
         dnl variables initialized at startup work).
         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_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
-

         dnl If using newer dev tools then there is a -single_module flag that
         dnl we can use to do this for dylibs, otherwise we'll need to use a helper
         dnl script.  Check the version of gcc to see which way we can go:
         dnl If using newer dev tools then there is a -single_module flag that
         dnl we can use to do this for dylibs, otherwise we'll need to use a helper
         dnl script.  Check the version of gcc to see which way we can go:


@@ -338,9 +341,6 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
            )
         ])
         if test "$bakefile_cv_gcc31" = "no"; then
            )
         ])
         if test "$bakefile_cv_gcc31" = "no"; then

-            AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH
-            chmod +x shared-ld-sh
-

             dnl Use the shared-ld-sh helper script
             SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
             SHARED_LD_CXX="$SHARED_LD_CC"
             dnl Use the shared-ld-sh helper script
             SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
             SHARED_LD_CXX="$SHARED_LD_CC"


@@ -360,29 +360,29 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
 
       *-*-aix* )
         if test "x$GCC" = "xyes"; then
 
       *-*-aix* )
         if test "x$GCC" = "xyes"; then

-           dnl at least gcc 2.95 warns that -fPIC is ignored when
-           dnl compiling each and every file under AIX which is annoying,
-           dnl so don't use it there (it's useless as AIX runs on
-           dnl position-independent architectures only anyhow)
-           PIC_FLAG=""
-
-           dnl -bexpfull is needed by AIX linker to export all symbols (by
-           dnl default it doesn't export any and even with -bexpall it
-           dnl doesn't export all C++ support symbols, e.g. vtable
-           dnl pointers) but it's only available starting from 5.1 (with
-           dnl maintenance pack 2, whatever this is), see
-           dnl http://www-128.ibm.com/developerworks/eserver/articles/gnu.html
-           case "${BAKEFILE_HOST}" in
-               *-*-aix5* )
-                   LD_EXPFULL="-Wl,-bexpfull"
-                   ;;
-           esac
-
-           SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
-           SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
-       else
-           dnl FIXME: makeC++SharedLib is obsolete, what should we do for
-           dnl        recent AIX versions?
+            dnl at least gcc 2.95 warns that -fPIC is ignored when
+            dnl compiling each and every file under AIX which is annoying,
+            dnl so don't use it there (it's useless as AIX runs on
+            dnl position-independent architectures only anyhow)
+            PIC_FLAG=""
+
+            dnl -bexpfull is needed by AIX linker to export all symbols (by
+            dnl default it doesn't export any and even with -bexpall it
+            dnl doesn't export all C++ support symbols, e.g. vtable
+            dnl pointers) but it's only available starting from 5.1 (with
+            dnl maintenance pack 2, whatever this is), see
+            dnl http://www-128.ibm.com/developerworks/eserver/articles/gnu.html
+            case "${BAKEFILE_HOST}" in
+                *-*-aix5* )
+                    LD_EXPFULL="-Wl,-bexpfull"
+                    ;;
+            esac
+
+            SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
+            SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
+        else
+            dnl FIXME: makeC++SharedLib is obsolete, what should we do for
+            dnl        recent AIX versions?

             AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
                           makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
             SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
             AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
                           makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
             SHARED_LD_CC="$AIX_CC_LD -p 0 -o"


@@ -403,7 +403,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
             PIC_FLAG="-KPIC"
         fi
       ;;
             PIC_FLAG="-KPIC"
         fi
       ;;

-      
+

       *-*-cygwin* | *-*-mingw32* )
         PIC_FLAG=""
         SHARED_LD_CC="\$(CC) -shared -o"
       *-*-cygwin* | *-*-mingw32* )
         PIC_FLAG=""
         SHARED_LD_CC="\$(CC) -shared -o"


@@ -418,7 +418,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         AC_BAKEFILE_CREATE_FILE_DLLAR_SH
         chmod +x dllar.sh
       ;;
         AC_BAKEFILE_CREATE_FILE_DLLAR_SH
         chmod +x dllar.sh
       ;;

-      
+

       powerpc-apple-macos* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
       *-*-sunos4* | \
       powerpc-apple-macos* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
       *-*-sunos4* | \


@@ -611,26 +611,20 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
 [
 
 AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
 [

-    RESCOMP=
-    SETFILE=
-

     case ${BAKEFILE_HOST} in 
         *-*-cygwin* | *-*-mingw32* )
             dnl Check for win32 resources compiler:
     case ${BAKEFILE_HOST} in 
         *-*-cygwin* | *-*-mingw32* )
             dnl Check for win32 resources compiler:

-            if test "$build" != "$host" ; then
-                RESCOMP=$host_alias-windres
-            else
-                AC_CHECK_PROG(RESCOMP, windres, windres, windres)
-            fi
+            AC_CHECK_TOOL(WINDRES, windres)

          ;;
  
       *-*-darwin* | powerpc-apple-macos* )
          ;;
  
       *-*-darwin* | powerpc-apple-macos* )

-            AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+            AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)

             AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
         ;;
     esac
 
             AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
         ;;
     esac
 

-    AC_SUBST(RESCOMP)
+    AC_SUBST(WINDRES)
+    AC_SUBST(REZ)

     AC_SUBST(SETFILE)
 ])
 
     AC_SUBST(SETFILE)
 ])
 


@@ -650,6 +644,15 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
 
     GCC_PCH=0
 
 
     GCC_PCH=0
 

+    case ${BAKEFILE_HOST} in 
+        *-*-cygwin* )
+            dnl PCH support is broken in cygwin gcc because of unportable
+            dnl assumptions about mmap() in gcc code which make PCH generation
+            dnl fail erratically; disable PCH completely until this is fixed
+            bk_use_pch="no"
+            ;;
+    esac
+

     if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
         if test "x$GCC" = "xyes"; then
             dnl test if we have gcc-3.4:
     if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
         if test "x$GCC" = "xyes"; then
             dnl test if we have gcc-3.4: