* Swap with*=1|0 to with*=yes|no in wx-config check.

* Fix misnamed variable which disabled the wx opengl test.

Originally committed to SVN as r2698.
This commit is contained in:
Amar Takhar 2009-01-15 01:14:41 +00:00
parent a196f1efbb
commit 1fc063f759
1 changed files with 5 additions and 6 deletions

View File

@ -931,11 +931,10 @@ AM_CONDITIONAL([HAVE_AUTOMATION], [test "$with_automation" = "yes"])
# Widget support
################
AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG(2.8.1, [have_wxconfig=1], [have_wxconfig=0], [std,gl,stc])
AM_PATH_WXCONFIG(2.8.1, [have_wxconfig="yes"], [have_wxconfig="no"], [std,gl,stc])
if test "$have_wxconfig" != 1; then
AC_MSG_FAILURE([wxWidgets detection failed, please set --with-wx* or add
the libraries to your LDFLAGS, CXX/CFLAGS.])
if test "$have_wxconfig" = "no"; then
AC_MSG_FAILURE([wxWidgets detection failed, please set --with-wx* or add the libraries to your LDFLAGS, CXX/CFLAGS.])
fi
AC_ARG_ENABLE(check-wx-opengl, [ --disable-check-wx-opengl
@ -951,7 +950,7 @@ int main(void) {
} ])
fi
if test "$with_agi_cv_wxopengl" = "no" || test "$enable_check-wx-opengl" = "no"; then
if test "$with_agi_cv_wxopengl" = "no" || test "$enable_check_wx_opengl" = "yes"; then
AC_MSG_FAILURE([wxWidgets OpenGL support missing])
fi
@ -967,7 +966,7 @@ int main(void) {
} ])
fi
if test "$with_agi_cv_wxstc" = "no" || test "$enable_check_wx_stc:" = "no"; then
if test "$with_agi_cv_wxstc" = "no" || test "$enable_check_wx_stc:" = "yes"; then
AC_MSG_FAILURE([wxWidgets StyledTextCtrl support missing])
fi