iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch configure.in to use the new wx2.9 m4 macros and change autogen.sh to look for wxwin29.mp4 versus wxwin28.mp4. This forces the requirement of wx2.9 now. 

Originally committed to SVN as r3227.
This commit is contained in:
Amar Takhar 2009-07-23 20:20:03 +00:00
parent 8ef5d3869a
commit 11ad86631a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/autogen.sh
View File

@ -25,7 +25,7 @@ INTLTOOL_REQUIRED_VERSION=0.31
LIBTOOL_REQUIRED_VERSION=1.5
REQUIRED_M4="fontutil.m4 glib-gettext.m4 intltool.m4 intl.m4 pkg.m4 iconv.m4"
REQUIRED_M4_WX="wxwin.m4 wxwin28.m4"
REQUIRED_M4_WX="wxwin29.m4 wxwin.m4"
PROJECT="aegisub"

9
aegisub/configure.in
View File

@ -26,7 +26,7 @@ m4_define([pulseaudio_required_version], [0.5])
m4_define([fontconfig_required_version], [2.4])
m4_define([freetype_required_version], [9.7.0])
m4_define([pkgconfig_required_version], [0.20])
m4_define([wx_required_version], [2.8.1])
m4_define([wx_required_version], [2.9.0])
#######
@ -812,8 +812,11 @@ AM_CONDITIONAL([HAVE_AUTOMATION], [test "$with_automation" = "yes"])
################
# Widget support
################
AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG(wx_required_version, [have_wxconfig="yes"], [have_wxconfig="no"], [std,gl,stc], [--unicode])
WX_CONFIG_OPTIONS
WX_STANDARD_OPTIONS([debug])
WX_DEBUG=$DEBUG
WX_UNICODE=$UNICODE
WX_CONFIG_CHECK([wx_required_version],,,[std,gl,stc],[$WXCONFIG_FLAGS])
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.])