|
Lines 4967-4976
Link Here
|
| 4967 |
echo "$as_me:$LINENO: result: yes" >&5 |
4967 |
echo "$as_me:$LINENO: result: yes" >&5 |
| 4968 |
echo "${ECHO_T}yes" >&6 |
4968 |
echo "${ECHO_T}yes" >&6 |
| 4969 |
WX_HOME=/usr/local/wx2 |
4969 |
WX_HOME=/usr/local/wx2 |
| 4970 |
if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h" |
4970 |
if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h" |
| 4971 |
then |
4971 |
then |
| 4972 |
WX_HOME=/usr/local |
4972 |
WX_HOME=/usr/local |
| 4973 |
if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h" |
4973 |
if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h" |
| 4974 |
then |
4974 |
then |
| 4975 |
WX_HOME=/usr |
4975 |
WX_HOME=/usr |
| 4976 |
fi |
4976 |
fi |
|
Lines 5025-5032
Link Here
|
| 5025 |
# Which version of wxWindows is this? |
5025 |
# Which version of wxWindows is this? |
| 5026 |
WX_VERSION=`${WX_CONFIG} --version` |
5026 |
WX_VERSION=`${WX_CONFIG} --version` |
| 5027 |
case "${WX_VERSION}" in |
5027 |
case "${WX_VERSION}" in |
| 5028 |
2.5*) |
5028 |
2.6*) |
| 5029 |
WX_VERSION="2.5" |
5029 |
WX_VERSION="2.6" |
| 5030 |
;; |
5030 |
;; |
| 5031 |
2.4*) |
5031 |
2.4*) |
| 5032 |
WX_VERSION="2.4" |
5032 |
WX_VERSION="2.4" |
|
Lines 5238-5244
Link Here
|
| 5238 |
fi |
5238 |
fi |
| 5239 |
|
5239 |
|
| 5240 |
WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags` |
5240 |
WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags` |
| 5241 |
CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.5" |
5241 |
CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.6" |
| 5242 |
case "${host}" in |
5242 |
case "${host}" in |
| 5243 |
*-apple-darwin*) |
5243 |
*-apple-darwin*) |
| 5244 |
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti" |
5244 |
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti" |
|
Lines 5247-5257
Link Here
|
| 5247 |
;; |
5247 |
;; |
| 5248 |
esac |
5248 |
esac |
| 5249 |
wx_wx_h="yes" |
5249 |
wx_wx_h="yes" |
| 5250 |
if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h" |
5250 |
if test ! -f "${WX_HOME}/include/wx-2.6/wx/version.h" |
| 5251 |
then |
5251 |
then |
| 5252 |
wx_wx_h="no" |
5252 |
wx_wx_h="no" |
| 5253 |
fi |
5253 |
fi |
| 5254 |
if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h" |
5254 |
if test ! -f "${WX_HOME}/include/wx-2.6/wx/stc/stc.h" |
| 5255 |
then |
5255 |
then |
| 5256 |
{ { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5 |
5256 |
{ { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5 |
| 5257 |
echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;} |
5257 |
echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;} |
