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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 8e4a4ac3c7b9b4bc1d52ac302d3245af70f04c37..b90f00647a626b08e15f518731c9fa9264b8a9de 100644 (file)
--- 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 4a0b4d2c5ce992f2fe38002eacb52c310e610ce5..88b39773663958d7b1d38c6d3f6d80dd9900fce4 100755 (executable)
--- 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