no real changes, moved Robin's changes to bakefile and regenerated using bakefile...

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

diff --git a/aclocal.m4 b/aclocal.m4
index 415d17b6cfe4f13b44f11c1970dbb37af63596f1..f8f879a9e256326a89b788df29fe8247e949b632 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,


@@ -1278,25 +1278,26 @@ 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
 

-       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
+        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
 #-----------------------------------------------------------------------------
             cat <<EOF >shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------


@@ -1369,7 +1370,7 @@ fi
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then

-    echo "c++ \${linking_flag} master.\$\$.o \${args}"
+    echo "cc \${linking_flag} master.\$\$.o \${args}"

 fi
 c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?
 fi
 c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?


@@ -1386,19 +1387,20 @@ exit 0
 EOF
             chmod +x shared-ld-sh
 
 EOF
             chmod +x shared-ld-sh
 

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

         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

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

diff --git a/configure b/configure
index 915749109b8219402b3d7d796c49d6bc947d56d0..abca79fde297d2ebef4cbdfbf1881464e9a9c9d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -34389,13 +34389,13 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6
         CXXFLAGS="$CXXFLAGS -fno-common"
 
 
         CXXFLAGS="$CXXFLAGS -fno-common"
 
 

-                               echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
+                                echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5

 echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
 if test "${wx_cv_gcc31+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
 if test "${wx_cv_gcc31+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-          cat >conftest.$ac_ext <<_ACEOF
+           cat >conftest.$ac_ext <<_ACEOF

 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF


@@ -34407,9 +34407,10 @@ int
 main ()
 {
 
 main ()
 {
 

-                  #if (__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
-                      #error old gcc
-                  #endif
+                   #if (__GNUC__ < 3) || \
+                       ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
+                       #error old gcc
+                   #endif

 
   ;
   return 0;
 
   ;
   return 0;


@@ -34428,14 +34429,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 

-                  wx_cv_gcc31=yes
+                   wx_cv_gcc31=yes

 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                  wx_cv_gcc31=no
+                   wx_cv_gcc31=no

 
 
 fi
 
 
 fi


@@ -34444,7 +34445,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $wx_cv_gcc31" >&5
 echo "${ECHO_T}$wx_cv_gcc31" >&6
 fi
 echo "$as_me:$LINENO: result: $wx_cv_gcc31" >&5
 echo "${ECHO_T}$wx_cv_gcc31" >&6

-       if test "$wx_cv_gcc31" = "no"; then
+        if test "$wx_cv_gcc31" = "no"; then

             cat <<EOF >shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------
             cat <<EOF >shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------


@@ -34517,7 +34518,7 @@ fi
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then

-    echo "c++ \${linking_flag} master.\$\$.o \${args}"
+    echo "cc \${linking_flag} master.\$\$.o \${args}"

 fi
 c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?
 fi
 c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?


@@ -34534,16 +34535,19 @@ exit 0
 EOF
             chmod +x shared-ld-sh
 
 EOF
             chmod +x shared-ld-sh
 

-                   SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
-           SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
-       else
-                       SHARED_LD_CC="\${CXX} -dynamiclib -single_module -o"
-            SHARED_LD_MODULE_CC="\${CXX} -bundle -single_module -o"
-       fi
-        SHARED_LD_CXX="$SHARED_LD_CC"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+                        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
+            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
+            SHARED_LD_CXX="$SHARED_LD_CC"
+            SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+        else
+                        SHARED_LD_CC="\${CC} -dynamiclib -single_module -o"
+            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -o"
+            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -o"
+        fi
+

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

-                      ;;
+      ;;

 
       *-*-aix* )
                 if test "x$GCC" != "xyes"; then
 
       *-*-aix* )
                 if test "x$GCC" != "xyes"; then