From 870b2cf2e7e93bce1b4b872e4350df07b1a883a7 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 13 Apr 2008 05:52:24 +0000
Subject: [PATCH] Fix --enable-wx-styledtextctrl,--enable-wx-opengl and rename
 them to --disable-check-wx-stc / --disable-check-wx-opengl which makes more
 sense.

Originally committed to SVN as r2175.
---
 configure.in | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index e5f44e850..43a5f361b 100644
--- a/configure.in
+++ b/configure.in
@@ -788,32 +788,34 @@ fi
 aegisub_save_CPPLAGS="$CPPLAGS"
 CPPFLAGS="$WX_CFLAGS"
 
-AC_ARG_ENABLE(wx-opengl, [  --enable-wx-opengl      Force wxwidgets OpenGL support. ])
+AC_ARG_ENABLE(check-wx-opengl, [  --disable-check-wx-opengl      Force wxwidgets OpenGL support. ])
 
-      AC_AGI_LINK([wxWidgets OpenGL support], [wxopengl], [wx/glcanvas.h], [$GL_CFLAGS $WX_CFLAGS], [$GL_LIBS $WX_LIBS],[
+if test "$enable_check-wx-opengl" = "yes"; then
+  AC_AGI_LINK([wxWidgets OpenGL support], [wxopengl], [wx/glcanvas.h], [$GL_CFLAGS $WX_CFLAGS], [$GL_LIBS $WX_LIBS],[
 #include <wx/glcanvas.h>
 int main(void) {
   wxGLCanvas *canvas;
   return 0;
-}])
+} ])
+fi
 
-if test "$with_agi_wxopengl" = "no"; then
+if test "$with_agi_wxopengl" = "no" || test "$enable_check-wx-opengl" = "no"; then
   AC_MSG_FAILURE([wxWidgets OpenGL support missing])
 fi
 
 
-AC_ARG_ENABLE(wx-styledtextctrl, [  --enable-wx-styledtextctrl
-                          Force wxwidgets StyledTextCtrl support.])
+AC_ARG_ENABLE(wx-stc, [  --disable-check--wx-stc     Force wxwidgets StyledTextCtrl support.])
 
-      AC_AGI_LINK([wxWidgets StyledTextCtrl support], [wxstc], [wx/stc/stc.h], [$WX_CFLAGS], [$WX_LIBS],[
+if test "$enable_check-wx-stc" = "yes"; then
+  AC_AGI_LINK([wxWidgets StyledTextCtrl support], [wxstc], [wx/stc/stc.h], [$WX_CFLAGS], [$WX_LIBS],[
 #include <wx/stc/stc.h>
 int main(void) {
   wxStyledTextCtrl *canvas;
   return 0;
-}
-])
+} ])
+fi
 
-if test "$with_agi_wxstc" = "no"; then
+if test "$with_agi_wxstc" = "no" || test "$enable_check-wx-stc" = "yes"; then
   AC_MSG_FAILURE([wxWidgets StyledTextCtrl support missing])
 fi