Fixes wx-console compile error with unicode-enabled wxWidgets.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1960 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 7a102e25f6e3ad81e03afb5cba8e57e5145c91f2..92b3246d07e9ec264b3debfa9893324c1267653f 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -232,8 +232,8 @@ if test x$support_wx_console = xyes; then
   abc=`$WXCONFIG --cppflags`
   pkg=$?
   if test $pkg = 0; then
-     WXCONS_CPPFLAGS=`$WXCONFIG --cppflags`
-     WXCONS_LDFLAGS=`$WXCONFIG --libs`
+     WXCONS_CPPFLAGS=`$WXCONFIG --unicode=no --cppflags`
+     WXCONS_LDFLAGS=`$WXCONFIG --unicode=no --libs`
      AC_SUBST(WXCONS_CPPFLAGS)
      AC_SUBST(WXCONS_LDFLAGS)
      WX_DIR=src/wx-console

diff --git a/bacula/configure b/bacula/configure
index 255d56e076d25e43ef5ea7de9f96406dd4853614..2b315d86269ea3c2fa0c5db93df55800ea695c73 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -5174,8 +5174,8 @@ if test x$support_wx_console = xyes; then
   abc=`$WXCONFIG --cppflags`
   pkg=$?
   if test $pkg = 0; then
-     WXCONS_CPPFLAGS=`$WXCONFIG --cppflags`
-     WXCONS_LDFLAGS=`$WXCONFIG --libs`
+     WXCONS_CPPFLAGS=`$WXCONFIG --unicode=no --cppflags`
+     WXCONS_LDFLAGS=`$WXCONFIG --unicode=no --libs`
 
 
      WX_DIR=src/wx-console

diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 902dbbb2e516adbe470def812f5db5250e06da99..408838d0842dadcc20daedeb96907e04daf09161 100644 (file)
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,3 +1,6 @@
+26-04-2005 :
+ - Fixes compile error with unicode-enabled wxWidgets.
+
 25-04-2005 :
  - Fixes to make wx-console compatible with wxWidgets 2.6.0.