[libvidcap-commit] SF.net SVN: libvidcap:[97] trunk

[libvidcap c. <lib...@li...>]

Revision: 97
          http://libvidcap.svn.sourceforge.net/libvidcap/?rev=97&view=rev
Author:   bcholew
Date:     2009-09-29 19:25:28 +0000 (Tue, 29 Sep 2009)

Log Message:
-----------
Set LIBS appropriately in configure.ac and use LIBS in vidcap.pc.in. This allows users of libvidcap to be able to get the correct link-time flags on Mac from vidcap.pc. This is modeled after portaudio. This change courtesy of Pete Grayson.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/examples/Makefile.am
    trunk/vidcap.pc.in

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-08-07 19:39:26 UTC (rev 96)
+++ trunk/configure.ac	2009-09-29 19:25:28 UTC (rev 97)
@@ -61,6 +61,7 @@
 
 if test "x$have_quicktime" = "xyes"; then
   AC_DEFINE(HAVE_QUICKTIME, [], [quicktime headers present])
+  LIBS="-framework Carbon -framework QuartzCore -framework QuickTime"
 fi
 
 if test "x$have_directshow" = "xyes"; then

Modified: trunk/examples/Makefile.am
===================================================================
--- trunk/examples/Makefile.am	2009-08-07 19:39:26 UTC (rev 96)
+++ trunk/examples/Makefile.am	2009-09-29 19:25:28 UTC (rev 97)
@@ -9,11 +9,4 @@
 
 simplegrab_SOURCES = simplegrab.c
 
-if HAVE_QUICKTIME
-AM_LDFLAGS +=				\
-	-framework Carbon		\
-	-framework QuartzCore		\
-	-framework QuickTime
-endif
-
 EXTRA_DIST = vidcapTester

Modified: trunk/vidcap.pc.in
===================================================================
--- trunk/vidcap.pc.in	2009-08-07 19:39:26 UTC (rev 96)
+++ trunk/vidcap.pc.in	2009-09-29 19:25:28 UTC (rev 97)
@@ -6,7 +6,7 @@
 Name: vidcap
 Description: Cross-platform video capture library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lvidcap @PTHREAD_LIBS@
+Libs: -L${libdir} -lvidcap @LIBS@ @PTHREAD_LIBS@
 Libs.private:
 Cflags: -I${includedir}
 Requires.private: @PKG_REQUIRES@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.