From 11ad86631a77f063fd41fbe1bbc96c03495f03df Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 20:20:03 +0000 Subject: [PATCH] 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. --- aegisub/autogen.sh | 2 +- aegisub/configure.in | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/aegisub/autogen.sh b/aegisub/autogen.sh index 572effc8e..d38f0eb01 100755 --- a/aegisub/autogen.sh +++ b/aegisub/autogen.sh @@ -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" diff --git a/aegisub/configure.in b/aegisub/configure.in index 919e566ed..d29aff8eb 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -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.])