From: Nicolas Boichat <nicolas@boichat.ch>
Date: Tue, 26 Apr 2005 17:30:49 +0000 (+0000)
Subject: Fixes wx-console compile error with unicode-enabled wxWidgets.
X-Git-Tag: Release-1.38.0~538
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=41dac1d61c0bbc7e7d8b3b5f0b7452f8edd3f2f7;p=bacula%2Fbacula

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 7a102e25f6..92b3246d07 100644
--- 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 255d56e076..2b315d8626 100755
--- 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 902dbbb2e5..408838d084 100644
--- 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.