Sophie

Sophie

distrib > Mageia > 3 > x86_64 > media > core-release-src > by-pkgid > f3f952f6d0fa5ee94b6094bfdb8b7390 > files > 5

codeblocks-10.05-6.mga3.src.rpm

diff -up codeblocks-10.05-release/configure.in.squirrel codeblocks-10.05-release/configure.in
--- codeblocks-10.05-release/configure.in.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/configure.in	2012-01-15 11:01:47.000000000 +0100
@@ -62,11 +62,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML
 CC=$save_CC
 CPP=$save_CPP
 
-
 AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes])
 AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes])
 AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes])
 
+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([SQUIRREL], [squirrel], [HAVE_SQUIRREL=yes], [HAVE_SQUIRREL=no])
+AM_CONDITIONAL([HAVE_SQUIRREL], [test "$HAVE_SQUIRREL" = yes])
+CB_SQUIRREL_CFLAGS="$SQUIRREL_CFLAGS"
+CB_SQUIRREL_LIBS="$SQUIRREL_LIBS"
+AC_SUBST(CB_SQUIRREL_CFLAGS)
+AC_SUBST(CB_SQUIRREL_LIBS)
+
 dnl versioning info for libtool
 dnl Note this is the ABI version which is not the same as our actual library version
 CODEBLOCKS_CURRENT=0
diff -up codeblocks-10.05-release/src/include/Makefile.am.squirrel codeblocks-10.05-release/src/include/Makefile.am
--- codeblocks-10.05-release/src/include/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/include/Makefile.am	2012-01-15 11:01:47.000000000 +0100
@@ -10,7 +10,6 @@ endif
 INCLUDES = $(WX_CXXFLAGS) \
 			-I$(top_srcdir)/src/include \
 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
-			-I$(top_srcdir)/src/include/scripting/include \
  			-I$(top_srcdir)/src/include/scripting/sqplus \
 			-I$(top_srcdir)/src/include/mozilla_chardet
 
@@ -19,6 +18,12 @@ SUBDIRS += tinyxml
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 # Because we are not generating any programs/libraries with this makefile,
 # $(CXXCOMPILE) is empty.
 # Create the basic one here:
diff -up codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/include/scripting/Makefile.am
--- codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel	2010-05-22 12:32:39.000000000 +0200
+++ codeblocks-10.05-release/src/include/scripting/Makefile.am	2012-01-15 11:01:47.000000000 +0100
@@ -1 +1,4 @@
-SUBDIRS = squirrel sqstdlib sqplus bindings include
+SUBDIRS = sqplus bindings
+if ! HAVE_SQUIRREL
+SUBDIRS += squirrel sqstdlib include
+endif
diff -up codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h
--- codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel	2010-05-22 12:32:39.000000000 +0200
+++ codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h	2012-01-15 11:01:47.000000000 +0100
@@ -47,6 +47,7 @@
 #define SQ_CALL_RAISE_ERROR SQFalse
 #endif
 
+#undef _UNICODE
 #include "squirrel.h"
 
 // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types
diff -up codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am
--- codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am	2012-01-15 11:02:00.000000000 +0100
@@ -3,10 +3,15 @@ SUBDIRS = depslib resources
 INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/include \
 		-I$(top_srcdir)/src/include/scripting/sqplus \
 		-I$(top_srcdir)/src/plugins/compilergcc/depslib/src
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 AM_CXXFLAGS = -DDEPSLIB_UNIX
 
 pluginlibdir = $(pkglibdir)/plugins
diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am
--- codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am	2012-01-15 11:02:00.000000000 +0100
@@ -10,7 +10,6 @@ endif
 INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/include \
 		-I$(top_srcdir)/src/include/scripting/bindings \
 		-I$(top_srcdir)/src/include/scripting/sqplus
 
@@ -23,9 +22,7 @@ libhelp_plugin_la_LDFLAGS = -module -ver
 libhelp_plugin_la_LIBADD = $(PLUGIN_WX_LIBS) \
 							../../../sdk/libcodeblocks.la \
 							../../../sdk/scripting/bindings/libsqbindings.la \
-							../../../sdk/scripting/sqplus/libsqplus.la \
-							../../../sdk/scripting/sqstdlib/libsqstdlib.la \
-							../../../sdk/scripting/squirrel/libsquirrel.la
+							../../../sdk/scripting/sqplus/libsqplus.la
 
 if ! HAVE_BZIP2
 libhelp_plugin_la_LIBADD += bzip2/libbzip2.la
@@ -44,6 +41,15 @@ if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+libhelp_plugin_la_LIBADD += $(SQUIRREL_LIBS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+libhelp_plugin_la_LIBADD += 	../../../sdk/scripting/sqstdlib/libsqstdlib.la \
+				../../../sdk/scripting/squirrel/libsquirrel.la
+endif
+
 libhelp_plugin_la_SOURCES = help_common.cpp \
 			HelpConfigDialog.cpp \
 			help_plugin.cpp \
diff -up codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am
--- codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am	2012-01-15 11:02:00.000000000 +0100
@@ -4,9 +4,7 @@ INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
 		-I$(srcdir)/../wxSmithContribItems/wxflatnotebook/wxFlatNotebook/include \
-		-I$(top_srcdir)/src/include/scripting/include \
 		-I$(top_srcdir)/src/include/scripting/sqplus \
-		-I$(top_srcdir)/src/include/scripting/squirrel \
 		-I$(top_srcdir)/src/include/scripting/bindings \
 		-I$(top_srcdir)/src/include/mozilla_chardet
 
@@ -14,6 +12,12 @@ if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 pluginlibdir = $(pkglibdir)/plugins
 
 pluginlib_LTLIBRARIES = liblib_finder.la
diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am
--- codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am	2012-01-15 11:07:13.000000000 +0100
@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID
 INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-                -I$(top_srcdir)/src/include/scripting/include \
-                -I$(top_srcdir)/src/include/scripting/squirrel \
                 -I$(top_srcdir)/src/include/scripting/sqplus \
                 -I$(top_srcdir)/src/include/scripting/bindings \
 		-I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include \
@@ -16,6 +14,12 @@ if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 lib_LTLIBRARIES = libwxsmithlib.la
 
 libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared
diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
--- codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am	2012-01-15 11:07:28.000000000 +0100
@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID
 INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/include \
-		-I$(top_srcdir)/src/include/scripting/squirrel \
 		-I$(top_srcdir)/src/include/scripting/sqplus \
 		-I$(top_srcdir)/src/include/scripting/bindings \
 		-I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
@@ -15,6 +13,12 @@ if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 noinst_LTLIBRARIES = libwxsmith_wxwidgets.la
 
 libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
diff -up codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am
--- codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel	2010-05-22 12:30:49.000000000 +0200
+++ codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am	2012-01-15 11:05:13.000000000 +0100
@@ -4,9 +4,14 @@ INCLUDES = $(WX_CXXFLAGS) \
 		$(WX_GTK2_CFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/include \
     	-I$(top_srcdir)/src/include/scripting/sqplus
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 pluginlibdir = $(pkglibdir)/plugins
 
 pluginlib_LTLIBRARIES = libdebugger.la
diff -up codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am
--- codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am	2012-01-15 11:02:00.000000000 +0100
@@ -3,13 +3,18 @@ SUBDIRS = resources
 INCLUDES = $(WX_CXXFLAGS) \
 		-I$(top_srcdir)/src/include \
 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
-		-I$(top_srcdir)/src/include/scripting/include \
 		-I$(top_srcdir)/src/include/scripting/sqplus
 
 if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 pluginlibdir = $(pkglibdir)/plugins
 
 pluginlib_LTLIBRARIES = libscriptedwizard.la
diff -up codeblocks-10.05-release/src/sdk/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/Makefile.am
--- codeblocks-10.05-release/src/sdk/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/sdk/Makefile.am	2012-01-15 11:03:23.000000000 +0100
@@ -3,7 +3,7 @@ SUBDIRS = scripting wxscintilla resource
 INCLUDES = $(WX_CXXFLAGS) \
 			-I$(top_srcdir)/src/include \
 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
-			-I$(top_srcdir)/src/include/scripting/include \
+			-I$(top_srcdir)/src/include/scripting/bindings \
  			-I$(top_srcdir)/src/include/scripting/sqplus \
 			-I$(top_srcdir)/src/include/mozilla_chardet
 
@@ -14,8 +14,6 @@ libcodeblocks_la_LDFLAGS = -version-info
 libcodeblocks_la_LIBADD =  $(WX_LIBS) \
 			scripting/bindings/libsqbindings.la \
 			scripting/sqplus/libsqplus.la \
-			scripting/sqstdlib/libsqstdlib.la \
-			scripting/squirrel/libsquirrel.la \
 			wxscintilla/libwxscintilla.la
 
 if ! HAVE_TINYXML
@@ -25,6 +23,14 @@ else
 libcodeblocks_la_LIBADD += -ltinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS)
+else
+INCLUDES += 		-I$(top_srcdir)/src/include/scripting/include
+libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la
+endif
+
 libcodeblocks_la_SOURCES = annoyingdialog.cpp \
 						autodetectcompilers.cpp \
 						base64.cpp \
diff -up codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am
--- codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel	2010-05-22 12:02:34.000000000 +0200
+++ codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am	2012-01-15 11:01:47.000000000 +0100
@@ -1,10 +1,16 @@
 INCLUDES = $(WX_CXXFLAGS) \
 			-I$(top_srcdir)/src/include \
 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
-			-I$(top_srcdir)/src/include/scripting/include \
 			-I$(top_srcdir)/src/include/scripting/bindings \
 			-I$(top_srcdir)/src/include/scripting/sqplus
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
+
 noinst_LTLIBRARIES = libsqbindings.la
 
 libsqbindings_la_SOURCES = scriptbindings.cpp \
diff -up codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/Makefile.am
--- codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel	2010-05-22 12:02:34.000000000 +0200
+++ codeblocks-10.05-release/src/sdk/scripting/Makefile.am	2012-01-15 11:01:47.000000000 +0100
@@ -1 +1,5 @@
-SUBDIRS = squirrel sqstdlib sqplus bindings
+SUBDIRS = sqplus bindings
+if ! HAVE_SQUIRREL
+SUBDIRS += squirrel sqstdlib
+endif
+
diff -up codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel codeblocks-10.05-release/src/sdk/scriptingmanager.cpp
--- codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel	2010-05-22 12:10:05.000000000 +0200
+++ codeblocks-10.05-release/src/sdk/scriptingmanager.cpp	2012-01-15 11:01:47.000000000 +0100
@@ -29,10 +29,10 @@
 #include "crc32.h"
 #include "menuitemsmanager.h"
 #include "genericmultilinenotesdlg.h"
-#include "scripting/sqplus/sqplus.h"
-#include "scripting/bindings/scriptbindings.h"
-#include "scripting/bindings/sc_plugin.h"
-#include "scripting/include/sqstdstring.h"
+#include "sqplus.h"
+#include "scriptbindings.h"
+#include "sc_plugin.h"
+#include "sqstdstring.h"
 
 template<> ScriptingManager* Mgr<ScriptingManager>::instance = 0;
 template<> bool  Mgr<ScriptingManager>::isShutdown = false;
diff -up codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am
--- codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel	2010-05-22 12:02:20.000000000 +0200
+++ codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am	2012-01-15 11:01:47.000000000 +0100
@@ -1,5 +1,10 @@
-INCLUDES = -I$(top_srcdir)/src/include/scripting/include \
-					-I$(top_srcdir)/src/include/scripting/sqplus
+if HAVE_SQUIRREL
+INCLUDES = $(SQUIRREL_CFLAGS)
+else
+INCLUDES = -I$(top_srcdir)/src/include/scripting/include
+endif
+
+INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus
 
 noinst_LTLIBRARIES = libsqplus.la
 
diff -up codeblocks-10.05-release/src/src/Makefile.am.squirrel codeblocks-10.05-release/src/src/Makefile.am
--- codeblocks-10.05-release/src/src/Makefile.am.squirrel	2012-01-15 11:01:47.000000000 +0100
+++ codeblocks-10.05-release/src/src/Makefile.am	2012-01-15 11:04:29.000000000 +0100
@@ -3,7 +3,6 @@ SUBDIRS = resources
 INCLUDES = $(WX_CXXFLAGS) \
 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
 			-I$(top_srcdir)/src/include \
-			-I$(top_srcdir)/src/include/scripting/include \
 			-I$(top_srcdir)/src/include/scripting/sqplus \
 			-I$(top_srcdir)/src/include/mozilla_chardet
 
@@ -11,6 +10,12 @@ if ! HAVE_TINYXML
 INCLUDES += -I$(top_srcdir)/src/include/tinyxml
 endif
 
+if HAVE_SQUIRREL
+INCLUDES += $(SQUIRREL_CFLAGS)
+else
+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
+endif
+
 if CODEBLOCKS_LINUX
 AM_CPPFLAGS = -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\""
 endif

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional