Fixed cursor resource names to actually match what's in the resource file.

[wxWidgets.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 5a34ac49d1ff356fb39ec485f50b68c817ee593e..01c7309c6fde6c2cb8d8874a3591f428c1eaaecd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-

 
 

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002

 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,


@@ -1111,14 +1111,18 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
     PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOSX=0
     PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOSX=0

+    PLATFORM_OS2=0

     
     case "${host}" in
         *-*-cygwin* | *-*-mingw32* )
             PLATFORM_WIN32=1
         ;;
     
     case "${host}" in
         *-*-cygwin* | *-*-mingw32* )
             PLATFORM_WIN32=1
         ;;

-        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+        *-pc-msdosdjgpp )

             PLATFORM_MSDOS=1
         ;;
             PLATFORM_MSDOS=1
         ;;

+        *-pc-os2_emx | *-pc-os2-emx )
+            PLATFORM_OS2=1
+        ;;

         powerpc-*-darwin* )
             PLATFORM_MAC=1
             PLATFORM_MACOSX=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_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=""
     SO_SUFFIX="so"
     SO_SUFFIX_MODULE="so"
     EXEEXT=""

+    LIBPREFIX=lib

     DLLPREFIX=lib
     DLLPREFIX_MODULE=
     
     DLLPREFIX=lib
     DLLPREFIX_MODULE=
     


@@ -1172,10 +1178,15 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;

-        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+        *-pc-msdosdjgpp )

             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;

+        *-pc-os2_emx | *-pc-os2-emx )
+            EXEEXT=".exe"
+            DLLPREFIX=""
+            LIBPREFIX=""
+        ;;

         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"


@@ -1185,6 +1196,7 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
     AC_SUBST(SO_SUFFIX)
     AC_SUBST(SO_SUFFIX_MODULE)
     AC_SUBST(EXEEXT)
     AC_SUBST(SO_SUFFIX)
     AC_SUBST(SO_SUFFIX_MODULE)
     AC_SUBST(EXEEXT)

+    AC_SUBST(LIBPREFIX)

     AC_SUBST(DLLPREFIX)
     AC_SUBST(DLLPREFIX_MODULE)
 ])
     AC_SUBST(DLLPREFIX)
     AC_SUBST(DLLPREFIX_MODULE)
 ])


@@ -1266,7 +1278,27 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
         dnl or with a double stage link in order to create a single module
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
 
         dnl or with a double stage link in order to create a single module
         dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
 

-        cat <<EOF >shared-ld-sh
+        dnl If using newer dev tools then there is a -single_module flag that
+        dnl we can use to do this, otherwise we'll need to use a helper
+        dnl script.  Check the version of gcc to see which way we can go:
+        AC_CACHE_CHECK([for gcc 3.1 or later], wx_cv_gcc31, [
+           AC_TRY_COMPILE([],
+               [
+                   #if (__GNUC__ < 3) || \
+                       ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
+                       #error old gcc
+                   #endif
+               ],
+               [
+                   wx_cv_gcc31=yes
+               ],
+               [
+                   wx_cv_gcc31=no
+               ]
+           )
+        ])
+        if test "$wx_cv_gcc31" = "no"; then
+            cat <<EOF >shared-ld-sh

 #!/bin/sh
 #-----------------------------------------------------------------------------
 #-- Name:        distrib/mac/shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------
 #-- Name:        distrib/mac/shared-ld-sh


@@ -1353,17 +1385,22 @@ rm -f master.\$\$.o
 
 exit 0
 EOF
 
 exit 0
 EOF

-        chmod +x 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_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
+            SHARED_LD_CXX="$SHARED_LD_CC"
+            SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+        else
+            dnl Use the -single_module flag and let the linker do it for us
+            SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
+        fi

 
 

-        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
-        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
-        SHARED_LD_CXX="$SHARED_LD_CC"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"

         PIC_FLAG="-dynamic -fPIC"
         PIC_FLAG="-dynamic -fPIC"

-        dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
-        dnl         matter for C projects and matters for C++ ones
-        dnl FIXME - newer devel tools have linker flag to do this, the script
-        dnl         is not necessary - detect!

       ;;
 
       *-*-aix* )
       ;;
 
       *-*-aix* )


@@ -1401,7 +1438,7 @@ EOF
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \

-      *-pc-os2-emx | \
+      *-pc-os2_emx | *-pc-os2-emx | \

       *-*-sysv5* )
         dnl defaults are ok
       ;;
       *-*-sysv5* )
         dnl defaults are ok
       ;;


@@ -1544,7 +1581,7 @@ if test \$DEPSMODE = gcc ; then
     else
         depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
         if test -f \$depfile ; then
     else
         depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
         if test -f \$depfile ; then

-            sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+            sed -e "/^\$objfile/!s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d

             rm -f \$depfile
         fi
     fi
             rm -f \$depfile
         fi
     fi


@@ -1576,13 +1613,9 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
     AC_PROG_MAKE_SET
     AC_SUBST(MAKE_SET)
     
     AC_PROG_MAKE_SET
     AC_SUBST(MAKE_SET)
     

-    if test "$build" != "$host" ; then
-        AR=$host_alias-ar
-        STRIP=$host_alias-strip
-    else
-        AC_CHECK_PROG(AR, ar, ar, ar)
-        AC_CHECK_PROG(STRIP, strip, strip, true)
-    fi
+    AC_CHECK_TOOL(AR, ar, ar)
+    AC_CHECK_TOOL(STRIP, strip, :)
+    AC_CHECK_TOOL(NM, nm, :)

 
     case ${host} in
         *-hp-hpux* )
 
     case ${host} in
         *-hp-hpux* )