Aegisub
/
Aegisub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Amar Takhar 2008-04-13 05:52:24 +00:00
parent aa7cc5a2dc
commit 870b2cf2e7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.in
View File

@ -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