From 067bf21434a7acdc924866b096d9e87d6d4014b2 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Tue, 3 May 2005 12:22:21 +0000 Subject: [PATCH] Fix wxWidgets 2.4 problem at configure time. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1979 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 11 +++++++++-- bacula/configure | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 8e4a4ac3c7..b90f00647a 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -232,8 +232,15 @@ if test x$support_wx_console = xyes; then abc=`$WXCONFIG --cppflags` pkg=$? if test $pkg = 0; then - WXCONS_CPPFLAGS=`$WXCONFIG --unicode=no --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --unicode=no --libs` + WXRELEASE=`$WXCONFIG --release` + if test $WXRELEASE = 2.6; then + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` + WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` + else + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` + fi + AC_SUBST(WXCONS_CPPFLAGS) AC_SUBST(WXCONS_LDFLAGS) WX_DIR=src/wx-console diff --git a/bacula/configure b/bacula/configure index 4a0b4d2c5c..88b3977366 100755 --- a/bacula/configure +++ b/bacula/configure @@ -5174,8 +5174,15 @@ if test x$support_wx_console = xyes; then abc=`$WXCONFIG --cppflags` pkg=$? if test $pkg = 0; then - WXCONS_CPPFLAGS=`$WXCONFIG --unicode=no --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --unicode=no --libs` + WXRELEASE=`$WXCONFIG --release` + if test $WXRELEASE = 2.6; then + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` + WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` + else + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` + fi + WX_DIR=src/wx-console -- 2.39.5