fixed wx-config together with gcc-3.4

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

diff --git a/configure b/configure
index 6c0bd16b07a133a1a8683e1c47589f00d6603d21..ea6ccd308f64fe9f10cb9432014da3c5566404b5 100755 (executable)
--- a/configure
+++ b/configure
@@ -10688,7 +10688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \

-   '' \
+   ''\
+   '#include <stdlib.h>' \

    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \


@@ -10702,8 +10703,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -11328,7 +11329,8 @@ else
   fi
 fi
 for ac_declaration in \
   fi
 fi
 for ac_declaration in \

-   '' \
+   ''\
+   '#include <stdlib.h>' \

    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \


@@ -11342,8 +11344,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -35895,19 +35897,16 @@ EOF
 
 
 if test $GCC_PCH = 1 ; then
 
 
 if test $GCC_PCH = 1 ; then

+    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"

     CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
     case "${host}" in
         powerpc-*-darwin* )
     CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
     case "${host}" in
         powerpc-*-darwin* )

-                                    CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
+                                    CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+            CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"

             ;;
     esac
 fi
             ;;
     esac
 fi

-case "${host}" in
-    powerpc-*-darwin* )
-                        CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
-        ;;
-esac

 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"

diff --git a/configure.in b/configure.in
index 61f1156858e542cd47437a94e83c4a4785789d56..e310e7fea1c11c13f2f18cb555cad7f148f7adea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5769,24 +5769,18 @@ AC_BAKEFILE
 
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then
 
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then

+    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"

     CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
     case "${host}" in
         powerpc-*-darwin* )
             dnl Some Apple's GCC version are broken and can't handle the
             dnl pragmas:
     CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
     case "${host}" in
         powerpc-*-darwin* )
             dnl Some Apple's GCC version are broken and can't handle the
             dnl pragmas:

+            CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"

             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
     esac
 fi
             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
     esac
 fi

-dnl We have to output NO_GCC_PRAGMA with wx-config on Apple, too:
-case "${host}" in
-    powerpc-*-darwin* )
-        dnl Some Apple's GCC version are broken and can't handle the
-        dnl pragmas:
-        CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
-        ;;
-esac

 
 
 dnl for convenience, sort the samples in alphabetical order
 
 
 dnl for convenience, sort the samples in alphabetical order