AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Configuration fixes for OS/2 specific "Innotek gcc" port.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2004-02-28 17:28:05 +00:00
parent 3c221c5088
commit dc4118b883
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.in
View File

@ -295,7 +295,7 @@ case "${host}" in
DEFAULT_DEFAULT_wxUSE_PM=1 DEFAULT_DEFAULT_wxUSE_PM=1
dnl "c++" wrapper is not always available, so always use plain gcc. dnl "c++" wrapper is not always available, so always use plain gcc.
CXX=gcc CXX=gcc
LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals" LDFLAGS="$LDFLAGS -Zcrtdll"
dnl dnl
dnl Some special code that's automatically added by autoconf-2.57 for OS/2 dnl Some special code that's automatically added by autoconf-2.57 for OS/2
dnl and hopefully also by autoconf-2.58 and newer on all other platforms. dnl and hopefully also by autoconf-2.58 and newer on all other platforms.
@ -1499,7 +1499,7 @@ case "${host}" in
dnl Include resources for the "native" port (wxPM). dnl Include resources for the "native" port (wxPM).
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi fi
AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[ AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[ [
#if (__GNUC__ < 3) #if (__GNUC__ < 3)
@ -1507,17 +1507,35 @@ case "${host}" in
#endif #endif
], ],
[ [
wx_cv_gcc3=yes AC_TRY_COMPILE([],
[
#if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
#error intermediate gcc
#endif
],
[
wx_cv_gccversion=Innotek
],
[
wx_cv_gccversion=3
]
)
], ],
[ [
wx_cv_gcc3=no wx_cv_gccversion=2
] ]
) )
]) ])
if test "$wx_cv_gcc3" = "no"; then if test "$wx_cv_gccversion" = "2"; then
LIBS="$LIBS -lstdcpp" LIBS="$LIBS -lstdcpp"
LDFLAGS="$LDFLAGS -Zsysv-signals"
else else
LIBS="$LIBS -lstdcxx" if test "$wx_cv_gccversion" = "3"; then
LIBS="$LIBS -lstdcxx"
LDFLAGS="$LDFLAGS -Zsysv-signals"
else
LIBS="$LIBS -lstdc++"
fi
fi fi
dnl (end of OS/2-only piece) dnl (end of OS/2-only piece)
;; ;;