From 4c3dde50f65786ae1247564eca10099eaf7a1974 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 11 Mar 2008 07:24:10 +0000 Subject: [PATCH] Add two new switches --enable-wx-opengl and --enable-wx-styledtextctrl, useful for development purposes, but also useful to avoid invoking the wonderfully slow g++ to test for availability during multiple ./configure runs. Originally committed to SVN as r2020. --- configure.in | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 46d4a6574..009ed8cf0 100644 --- a/configure.in +++ b/configure.in @@ -184,7 +184,7 @@ if test "$with_pulseaudio" = "yes"; then AC_DEFINE(WITH_PULSEAUDIO, 1, [Enable PulseAudio support]) fi -AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider. +AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider. (default: auto)], openal_disabled="(disabled)") if test "x$with_openal" != xno; then PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no]) @@ -541,20 +541,30 @@ fi aegisub_save_CPPLAGS="$CPPLAGS" CPPFLAGS="$WX_CFLAGS" +AC_ARG_ENABLE(wx-opengl, [ --enable-wx-opengl Force wxwidgets OpenGL support. ]) AC_MSG_CHECKING([wxWidgets OpenGL support]) -AC_TRY_COMPILE([#include ], - [wxGLCanvas *canvas;], - with_wxgl=yes, with_wxgl=no) +if test "$enable_wx_opengl" != "yes"; then + AC_TRY_COMPILE([#include ], + [wxGLCanvas *canvas;], + with_wxgl=yes, with_wxgl=no) +else + with_wxgl="yes" +fi AC_MSG_RESULT($with_wxgl) - if test "$with_wxgl" = "no"; then AC_MSG_FAILURE([wxWidgets OpenGL support missing]) fi +AC_ARG_ENABLE(wx-styledtextctrl, [ --enable-wx-styledtextctrl + Force wxwidgets StyledTextCtrl support. ]) AC_MSG_CHECKING([wxWidgets StyledTextCtrl support]) -AC_TRY_COMPILE([#include ], - [wxStyledTextCtrl *canvas;], - with_wxstc=yes, with_wxstc=no) +if test "$enable_wx_styledtextctrl" != "yes"; then + AC_TRY_COMPILE([#include ], + [wxStyledTextCtrl *canvas;], + with_wxstc=yes, with_wxstc=no) +else + with_wxstc="yes" +fi AC_MSG_RESULT($with_wxstc) if test "$with_wxstc" = "no"; then