Hi Adam,
attached is the patch I use under Debian to detect correctly and
automatically a wxWidgets version using a flavour. Note that I believe
it relies on a previous patch from Florian.
I don't propose it for inclusion now as I think it may break some other
builds but maybe it can help, who knows? ;)
If others want to try it on other systems, that would be great too.
Regards,
Raphaël
Index: acinclude.m4
===================================================================
--- acinclude.m4 (revision 4182)
+++ acinclude.m4 (working copy)
@@ -264,16 +264,23 @@
WX_OLD_CPPFLAGS="$CPPFLAGS"
if test "$pg_static_build" = "yes"
then
- WX_NEW_LDFLAGS=`${WX_CONFIG} --static --libs`
+ # we need, std,stc and ogl
+ WX_NEW_LDFLAGS=`${WX_CONFIG} --static --libs std,stc,ogl`
else
- WX_NEW_LDFLAGS=`${WX_CONFIG} --libs`
+ # we need, std,stc and ogl
+ WX_NEW_LDFLAGS=`${WX_CONFIG} --libs std,stc,ogl`
fi
# Which version of wxWindows is this?
WX_VERSION=`${WX_CONFIG} --version`
+ WX_FLAVOUR=""
case "${WX_VERSION}" in
2.6*)
WX_VERSION="2.6"
+ # since 2.6.0, wx-config --libs is verbose enough to suite
+ # our needs
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ WX_FLAVOUR=`grep this_flavour ${WX_CONFIG} | sed 's/.*"\([[^"]]*\)"/\1/'`
;;
2.5*)
WX_VERSION="2.5"
@@ -510,16 +517,16 @@
;;
esac
wx_wx_h="yes"
- if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}/wx/version.h"
+ if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/version.h"
then
wx_wx_h="no"
fi
- if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}/wx/stc/stc.h"
+ if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/stc/stc.h"
then
AC_MSG_ERROR([you need to install the stc package from wxWindows/contrib/src/stc])
wx_wx_h="no"
fi
- if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}/wx/ogl/ogl.h"
+ if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}${WX_FLAVOUR}/wx/ogl/ogl.h"
then
AC_MSG_ERROR([you need to install the ogl package from wxWindows/contrib/src/ogl with wxUSE_DEPRECATED=0])
wx_wx_h="no"