last commit accidentally used out of date aclocal.m4 and so overwrote some previous...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 7e74ff26cb6f4df0ed191111455d39ac51fa0c45..98d65fbe5adda3bcfa3113c83b4973ff4a9978c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -42194,7 +42194,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
             *-pc-os2_emx | *-pc-os2-emx )
                 PLATFORM_OS2=1
             ;;
             *-pc-os2_emx | *-pc-os2-emx )
                 PLATFORM_OS2=1
             ;;

-            powerpc-*-darwin* )
+            *-*-darwin* )

                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
             ;;
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
             ;;


@@ -42256,8 +42256,14 @@ fi;
 
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
 
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )

-                        CFLAGS="$CFLAGS -fno-common"
-        CXXFLAGS="$CXXFLAGS -fno-common"
+                        if test "x$GCC" = "xyes"; then
+            CFLAGS="$CFLAGS -fno-common"
+            CXXFLAGS="$CXXFLAGS -fno-common"
+        fi
+        if test "x$XLCC" = "xyes"; then
+            CFLAGS="$CFLAGS -qnocommon"
+            CXXFLAGS="$CXXFLAGS -qnocommon"
+        fi

         ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
         ;;
 
       *-pc-os2_emx | *-pc-os2-emx )


@@ -42329,7 +42335,7 @@ fi;
             LIBEXT=".$OS2_LIBEXT"
             dlldir="$bindir"
         ;;
             LIBEXT=".$OS2_LIBEXT"
             dlldir="$bindir"
         ;;

-        powerpc-*-darwin* )
+        *-*-darwin* )

             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
         ;;
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
         ;;


@@ -42620,7 +42626,12 @@ EOF
             SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
         fi
 
             SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
         fi
 

-        PIC_FLAG="-dynamic -fPIC"
+        if test "x$GCC" == "xyes"; then
+            PIC_FLAG="-dynamic -fPIC"
+        fi
+        if test "x$XLCC" = "xyes"; then
+            PIC_FLAG="-dynamic -DPIC"
+        fi

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


@@ -43255,7 +43266,7 @@ echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
         DEPSMODE=gcc
         DEPS_TRACKING=1
         case "${BAKEFILE_HOST}" in
         DEPSMODE=gcc
         DEPS_TRACKING=1
         case "${BAKEFILE_HOST}" in

-            powerpc-*-darwin* )
+            *-*-darwin* )

                                                 DEPSFLAG_GCC="-no-cpp-precomp -MMD"
             ;;
             * )
                                                 DEPSFLAG_GCC="-no-cpp-precomp -MMD"
             ;;
             * )