[Gridflow-cvs] [svn] commit: r4112 - in /trunk: configure format/dc1394.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Sun Nov 9 23:51:47 EST 2008


Author: matju
Date: Sun Nov  9 23:51:45 2008
New Revision: 4112

Log:
detect <dc1394/control.h> when it is called like that instead of whatever else.

Modified:
    trunk/configure
    trunk/format/dc1394.c

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Nov  9 23:51:45 2008
@@ -473,11 +473,11 @@
 	tag :dc1394
 	name "DC1394 for Linux"
 	uses_so ["-ldc1394_control"]
-	uses_h ["libdc1394/dc1394_control.h"]
+	uses_h Or["libdc1394/dc1394_control.h","dc1394/control.h"]
 	uses_o ["format/dc1394.o"]
 	options ["HAVE_DC1394"]
-	test proc {
-		c_test "
+	test proc {|f|
+		f.c_test "
 		#include#
 		int main () {return dc1394_get_camera_port==0;}"}}
 Feature.add {
@@ -842,6 +842,7 @@
   end
   f.puts "\#endif"
 end
+include_here f,"DC1394", :dc1394
 include_here f,"LIBMPEG", :mpeg3
 include_here f,"QUICKTIMEHW",:quicktimehw
 

Modified: trunk/format/dc1394.c
==============================================================================
--- trunk/format/dc1394.c (original)
+++ trunk/format/dc1394.c Sun Nov  9 23:51:45 2008
@@ -21,6 +21,7 @@
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#define DC1394_INCLUDE_HERE
 #include <libraw1394/raw1394.h>
 #include <libdc1394/dc1394_control.h>
 #include "../gridflow.h.fcs"



More information about the Gridflow-cvs mailing list