Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wx-config together with gcc-3.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-11-16 15:13:17 +00:00
parent dad6a47e6d
commit 130711ba32
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@@ -10688,7 +10688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
for ac_declaration in \ for ac_declaration in \
'' \ ''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int) throw ();' \
@@ -10702,8 +10703,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_declaration
#include <stdlib.h> #include <stdlib.h>
$ac_declaration
int int
main () main ()
{ {
@@ -11328,7 +11329,8 @@ else
fi fi
fi fi
for ac_declaration in \ for ac_declaration in \
'' \ ''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int) throw ();' \
@@ -11342,8 +11344,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_declaration
#include <stdlib.h> #include <stdlib.h>
$ac_declaration
int int
main () 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" CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
else else
case "${host}" in case "${host}" in
powerpc-*-darwin* ) powerpc-*-darwin* )
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
;; ;;
esac esac
fi 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'`"

10
configure.in
View File

@@ -5769,24 +5769,18 @@ AC_BAKEFILE
dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
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" CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
else else
case "${host}" in case "${host}" in
powerpc-*-darwin* ) powerpc-*-darwin* )
dnl Some Apple's GCC version are broken and can't handle the dnl Some Apple's GCC version are broken and can't handle the
dnl pragmas: dnl pragmas:
CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
;; ;;
esac esac
fi 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