From e5a4571c60e69229ce4a658abe4c28039ae0e446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?llu=C3=ADs=20g=C3=B3mez=20i=20bigord=C3=A0?=
 <lluisbigorda@users.sourceforge.net>
Date: Sat, 26 Sep 2009 13:09:29 +0000
Subject: added pdp_dc1394

svn path=/trunk/externals/pidip/; revision=12458
---
 Makefile.in               | 2 +-
 configure.ac              | 1 +
 include/pidip_config.h.in | 3 +++
 system/pidip.c            | 7 +++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 0e59869..a0bda6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,7 +45,7 @@ pidip.pd_darwin: pdp_pidip_all
 	strip -x pidip.pd_darwin
 
 pidip.pd_linux: pdp_pidip_all
-	rm -f pidip.pd_linu
+	rm -f pidip.pd_linux
 	g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(DC1394_LIBS)
 	strip --strip-unneeded pidip.pd_linux
 
diff --git a/configure.ac b/configure.ac
index 15c293a..ae0d16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,7 @@ AC_CHECK_LIB(Magick, XWindowByProperty,
 
 AC_CHECK_LIB(dc1394, dc1394_camera_enumerate, 
               [ PDP_DC1394_OBJECT="pdp_dc1394.o"
+              AC_DEFINE(HAVE_DC1394, 1, dc1394 cameras interface)
               DC1394_LIBS="-ldc1394 -lraw1394"],
               echo "dc1394 not found : not building pdp_dc1394", )
 
diff --git a/include/pidip_config.h.in b/include/pidip_config.h.in
index c45ad42..f9fa662 100644
--- a/include/pidip_config.h.in
+++ b/include/pidip_config.h.in
@@ -15,3 +15,6 @@
 
 /* Define to 1 if you have libdv for firewire camera */
 #undef HAVE_LIBDV
+
+/* Define to 1 if you have libdc1394 for dc camera */
+#undef HAVE_DC1394
diff --git a/system/pidip.c b/system/pidip.c
index c6514a2..af1c559 100644
--- a/system/pidip.c
+++ b/system/pidip.c
@@ -80,7 +80,11 @@ extern "C"
     void pdp_fdiff_setup(void);
     void pdp_hue_setup(void);
     void pdp_dot_setup(void);
+
+#ifdef HAVE_DC1394
     void pdp_dc1394_setup(void);
+#endif
+
 
 #ifdef HAVE_V4L2
     void pdp_v4l2_setup(void);
@@ -184,7 +188,10 @@ void pidip_setup(void){
     pdp_fdiff_setup();
     pdp_hue_setup();
     pdp_dot_setup();
+
+#ifdef HAVE_DC1394
     pdp_dc1394_setup();
+#endif
 
 #ifdef HAVE_V4L2
     pdp_v4l2_setup();
-- 
cgit v1.2.1