From svn-commits at oss.oracle.com  Wed Mar 23 20:00:22 2005
From: svn-commits at oss.oracle.com (svn-commits@oss.oracle.com)
Date: Wed Mar 23 20:00:26 2005
Subject: [Endpoint-commits] manish commits r6 - in trunk: . libsbp2 src
Message-ID: <200503240200.j2O20Mll024559@oss.oracle.com>

Author: manish
Date: 2005-03-23 20:00:18 -0600 (Wed, 23 Mar 2005)
New Revision: 6

Modified:
   trunk/configure.in
   trunk/libsbp2/Makefile.am
   trunk/src/Makefile.am
Log:
Use pkg-config to detect libraw1394


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2003-10-22 19:31:10 UTC (rev 5)
+++ trunk/configure.in	2005-03-24 02:00:18 UTC (rev 6)
@@ -40,8 +40,8 @@
 
 AC_SYS_LARGEFILE
 
-AC_LIB_RAW1394(0.9.0,,
-   AC_MSG_ERROR([Could not find libraw1394]))
+PKG_CHECK_MODULES(LIBRAW1394, libraw1394,,
+  AC_MSG_ERROR([Could not find libraw1394]))
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION,,
   AC_MSG_ERROR([Could not find GLIB 2.x]))

Modified: trunk/libsbp2/Makefile.am
===================================================================
--- trunk/libsbp2/Makefile.am	2003-10-22 19:31:10 UTC (rev 5)
+++ trunk/libsbp2/Makefile.am	2005-03-24 02:00:18 UTC (rev 6)
@@ -3,7 +3,7 @@
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(GLIB_CFLAGS)		\
-	$(LIBRAW1394_CPPFLAGS)	\
+	$(LIBRAW1394_CFLAGS)	\
 	-I$(includedir)
 
 libsbp2_a_SOURCES = \

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2003-10-22 19:31:10 UTC (rev 5)
+++ trunk/src/Makefile.am	2005-03-24 02:00:18 UTC (rev 6)
@@ -6,7 +6,7 @@
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(GLIB_CFLAGS)		\
-	$(LIBRAW1394_CPPFLAGS)	\
+	$(LIBRAW1394_CFLAGS)	\
 	-I$(includedir)
 
 endpoint_SOURCES = \