tomolt / GitBlocks

GitBlocks is an easy-to-use and small git plugin for Code::Blocks.
GNU General Public License v3.0
44 stars 27 forks source link

Build fails for wxWidgets 3.1 #2

Open rcortini opened 9 years ago

rcortini commented 9 years ago

When compiling against wxWidgets 3.1, build fails because of wrong CFLAGS and LDFLAGS. Suggested fix:

diff --git a/configure.ac b/configure.ac
index 0ef077e..3b014de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,11 +15,34 @@ AC_PROG_CXX
 # Checks for libraries & headers.
 LT_INIT([dlopen])

-WX_CFLAGS=`wx-config --version=2.8 --cflags`
-WX_LIBS=`wx-config --version=2.8 --libs`
-AC_SUBST(WX_CFLAGS)
+m4_include([wxwin.m4])
+AM_OPTIONS_WXCONFIG
+reqwx=2.8.0
+AM_PATH_WXCONFIG($reqwx, wxWin=1)
+if test "$wxWin" != 1; then
+   AC_MSG_ERROR([
+       wxWidgets must be installed on your system.
+ 
+       Please check that wx-config is in path, the directory
+       where wxWidgets libraries are installed (returned by
+       'wx-config --libs' or 'wx-config --static --libs' command)
+       is in LD_LIBRARY_PATH or equivalent variable and
+       wxWidgets version is $reqwx or above.
+       ])
+else
+  WX_CFLAGS=`wx-config --cflags`
+  WX_LIBS=`wx-config --libs`
+fi
+
+AC_SUBST(WX_INCLUDES)
 AC_SUBST(WX_LIBS)

+
+# WX_CFLAGS=`wx-config --version=2.8 --cflags`
+# WX_LIBS=`wx-config --version=2.8 --libs`
+# AC_SUBST(WX_CFLAGS)
+# AC_SUBST(WX_LIBS)
+
 PKG_CHECK_MODULES([CB], [codeblocks])
 AC_SUBST(CB_CFLAGS)
 AC_SUBST(CB_LIBS)
tomolt commented 9 years ago

Thanks for the patch! I'm currently not able to deploy it, but I'll merge it in a few days. I didn't even know that codeblocks already works for wxWidgets 3 ...