mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Combine --disable-check-wx-opengl and --disable-check-wx-stc into a single configure flag named --disable-slow-wx-checks

Browse source 
Originally committed to SVN as r5984.
This commit is contained in:
Thomas Goyne 2011-12-06 21:59:10 +00:00
parent 1a68f12dcb
commit 6d62437c42
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
aegisub/configure.in
View file

@ -789,10 +789,10 @@ 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.]) AC_MSG_FAILURE([wxWidgets detection failed, please set --with-wx* or add the libraries to your LDFLAGS, CXX/CFLAGS.])
fi fi
AC_ARG_ENABLE(check-wx-opengl, [ --disable-check-wx-opengl AC_ARG_ENABLE(slow-wx-checks, [ --disable-slow-wx-checks
Force wxwidgets OpenGL support. ]) Disable slow-running checks for wx components.])
if test "$enable_check_wx_opengl" != "no"; then if test "$enable_slow_wx_checks" != "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) {
@ -800,16 +800,6 @@ int main(void) {
wxGLContext *context; wxGLContext *context;
return 0; return 0;
} ]) } ])
fi
if test "$with_agi_cv_wxopengl" = "no" || test "$enable_check_wx_opengl" = "yes"; then
AC_MSG_FAILURE([wxWidgets OpenGL support missing])
fi
AC_ARG_ENABLE(check-wx-stc, [ --disable-check-wx-stc Force wxwidgets StyledTextCtrl support.])
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) {
@ -818,7 +808,11 @@ int main(void) {
} ]) } ])
fi fi
if test "$with_agi_cv_wxstc" = "no" || test "$enable_check_wx_stc:" = "yes"; then if test "$with_agi_cv_wxopengl" = "no"; then
AC_MSG_FAILURE([wxWidgets OpenGL support missing])
fi
if test "$with_agi_cv_wxstc" = "no"; then
AC_MSG_FAILURE([wxWidgets StyledTextCtrl support missing]) AC_MSG_FAILURE([wxWidgets StyledTextCtrl support missing])
fi fi