[Gridflow-cvs] [svn] commit: r6877 - /trunk/configure

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Sun Jan 6 03:46:14 EST 2013


Author: matju
Date: Sun Jan  6 03:46:13 2013
New Revision: 6877

Log:
reject -lopencv_contrib (what's that?)

Modified:
    trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Jan  6 03:46:13 2013
@@ -183,7 +183,8 @@
 
 def epath x; (ENV[x]||"").split(":") end
 
-C_INCLUDE_PATH  = (epath("CPLUS_INCLUDE_PATH") + epath("C_INCLUDE_PATH") + ["/usr/include"]).uniq
+C_INCLUDE_PATH  = (epath("CPLUS_INCLUDE_PATH") + epath("C_INCLUDE_PATH") +
+			["/usr/include", "/usr/include/i386-linux-gnu"]).uniq
 LIBRARY_PATH    = (epath("LIBRARY_PATH")                      + ["/usr/lib","/lib"]).uniq
 LD_LIBRARY_PATH = (epath("LD_LIBRARY_PATH") + read_ld_so_conf + ["/usr/lib","/lib"]).uniq
 LIBX11DIR = [
@@ -402,7 +403,10 @@
 		return quicktime_open==0; }`}}
 Feature.add("opencv","Intel OpenCV") {
 	produces_o ["src/opencv.o"]
-	uses_so `pkg-config --libs opencv`.split(/\s+/).reject{|x| x=="-lhighgui" or x=="-lcvaux" } if not OSX # for some reason, pkg-config output is wrong on mathieu's system
+	uses_so `pkg-config --libs opencv`.split(/\s+/).reject {|x|
+		# for some reason, pkg-config output is wrong on mathieu's system
+		x=="-lhighgui" or x=="-lcvaux" or x=="-lopencv_contrib"
+	} if not OSX
 	#uses_so ["-lcv"]
         #uses_so ["-L/Users/pddev/lib","-lcv"] if OSX # for the build system used in 9.13
         uses_so ["-F/Users/pddev/Frameworks -framework OpenCV"] if OSX



More information about the Gridflow-cvs mailing list