Fix --disable-check-wx-opengl --disable-check-wx-stc which forces opengl/stc

support on.  These two checks take a long time, before you use this know what
you are doing!

Originally committed to SVN as r2603.
This commit is contained in:
Amar Takhar 2009-01-01 12:43:17 +00:00
parent 1f19d5fc8b
commit 8a778ffd82
1 changed files with 4 additions and 4 deletions

View File

@ -856,10 +856,10 @@ if test "$have_wxconfig" != 1; then
the libraries to your LDFLAGS, CXX/CFLAGS.]) the libraries to your LDFLAGS, CXX/CFLAGS.])
fi fi
AC_ARG_ENABLE(check-wx-opengl, [--disable-check-wx-opengl AC_ARG_ENABLE(check-wx-opengl, [ --disable-check-wx-opengl
Force wxwidgets OpenGL support. ]) Force wxwidgets OpenGL support. ])
if test "$enable_check-wx-opengl" = "yes"; then if test "$enable_check_wx_opengl" != "no"; then
AC_AGI_LINK([wxWidgets OpenGL support], [wxopengl], [wx/glcanvas.h], [$GL_CFLAGS $WX_CFLAGS], [$GL_LIBS $WX_LIBS],[ AC_AGI_LINK([wxWidgets OpenGL support], [wxopengl], [wx/glcanvas.h], [$GL_CFLAGS $WX_CFLAGS], [$GL_LIBS $WX_LIBS],[
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
int main(void) { int main(void) {
@ -876,7 +876,7 @@ fi
AC_ARG_ENABLE(check-wx-stc, [ --disable-check-wx-stc Force wxwidgets StyledTextCtrl support.]) AC_ARG_ENABLE(check-wx-stc, [ --disable-check-wx-stc Force wxwidgets StyledTextCtrl support.])
if test "$enable_check_wx_stc:" != "no"; then if test "$enable_check_wx_stc" != "no"; then
AC_AGI_LINK([wxWidgets StyledTextCtrl support], [wxstc], [wx/stc/stc.h], [$WX_CFLAGS], [$WX_LIBS],[ AC_AGI_LINK([wxWidgets StyledTextCtrl support], [wxstc], [wx/stc/stc.h], [$WX_CFLAGS], [$WX_LIBS],[
#include <wx/stc/stc.h> #include <wx/stc/stc.h>
int main(void) { int main(void) {