From 1fc063f7590c0cff7a5c459fb94fbd8f46cb1bc6 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 15 Jan 2009 01:14:41 +0000 Subject: [PATCH] * 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. --- configure.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 1b90c9a81..5765048b6 100644 --- a/configure.in +++ b/configure.in @@ -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