[Iaxclient-cvs] SF.net SVN: iaxclient: [1221] trunk

[<bc...@us...>]

Revision: 1221
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1221&view=rev
Author:   bcholew
Date:     2007-10-22 09:28:22 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Oops. Add missing configuration changes for libvidcap integration.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/lib/Makefile.am
    trunk/simpleclient/stresstest/Makefile.am

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-10-22 02:36:41 UTC (rev 1220)
+++ trunk/configure.ac	2007-10-22 16:28:22 UTC (rev 1221)
@@ -135,13 +135,17 @@
          [Theora support])],,
       with_theora="auto")
 
+AC_ARG_WITH(vidcap,
+      [AS_HELP_STRING([--without-vidcap],
+         [libvidcap support])],,
+      with_vidcap="auto")
+
 AC_ARG_WITH(ffmpeg,
       [AS_HELP_STRING([--with-ffmpeg],
          [FFmpeg support])],
       FFMPEG="${with_ffmpeg}",
       with_ffmpeg="no")
 
-
 if test ! "x$enable_clients" = "xauto"; then
    for client in ${enable_clients}; do
       case "$client" in
@@ -239,6 +243,22 @@
 fi
 AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
 
+has_vidcap=no
+if test ! x$with_vidcap = xno; then
+   PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes)
+   if test x$has_vidcap = xyes; then
+      AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
+      PKG_REQUIRES="$PKG_REQUIRES vidcap"
+   elif test ! x$with_vidcap = xauto ; then
+      AC_MSG_ERROR([
+         libvidcap is required to build this package!
+         please see http://libvidcap.sourceforge.net/ for how to
+         obtain a copy.
+      ])
+   fi
+fi
+AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
+
 has_ffmpeg=no
 if test ! x$with_ffmpeg = xno; then
 PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes)

Modified: trunk/lib/Makefile.am
===================================================================
--- trunk/lib/Makefile.am	2007-10-22 02:36:41 UTC (rev 1220)
+++ trunk/lib/Makefile.am	2007-10-22 16:28:22 UTC (rev 1221)
@@ -40,32 +40,24 @@
 if WIN32
 SRCS += $(SRCS_WIN32)
 libiaxclient_la_LIBADD += -lwinmm -lwsock32
+endif
 
-if VIDEO
-SRCS += $(SRCS_WIN32_VIDEO)
-AM_CPPFLAGS += -I$(srcdir)/videoLib
-endif VIDEO
-endif WIN32
-
 if LINUX
 SRCS += $(SRCS_LINUX)
-
-if VIDEO
-SRCS += $(SRCS_LINUX_VIDEO)
 endif
-endif LINUX
 
 if MACOSX
 SRCS += $(SRCS_MACOSX)
 AM_LDFLAGS += -framework QuickTime
-if VIDEO
-SRCS += $(SRCS_MACOSX_VIDEO)
 endif
-endif MACOSX
 
 if VIDEO
 SRCS += $(SRCS_VIDEO)
+if VIDCAP
+libiaxclient_la_LIBADD += $(VIDCAP_LIBS)
+AM_CFLAGS += $(VIDCAP_CFLAGS)
 endif
+endif
 
 if USE_LOCAL_GSM
 SRCS += $(SRCS_LIBGSM)
@@ -153,9 +145,7 @@
 
 SRCS_VIDEO=					\
 	video.c					\
-	video.h					\
-	videoLib/video_grab.c			\
-	videoLib/video_grab.h
+	video.h
 
 SRCS_ILBC=					\
 	iLBC/anaFilter.c			\
@@ -186,30 +176,14 @@
 	winfuncs.c				\
 	portmixer/px_win_wmme/px_win_wmme.c
 
-SRCS_WIN32_VIDEO=				\
-	videoLib/win32/wingrab.cpp
-
 SRCS_LINUX=					\
 	portmixer/px_unix_oss/px_unix_oss.c	\
 	unixfuncs.c
 
-SRCS_LINUX_VIDEO=				\
-	videoLib/linux/libfg/capture.c		\
-	videoLib/linux/libfg/capture.h		\
-	videoLib/linux/libfg/frame.c		\
-	videoLib/linux/libfg/frame.h		\
-	videoLib/linux/libfg/libfg.h		\
-	videoLib/linux/linuxgrab.c
-
 SRCS_MACOSX=					\
 	portmixer/px_mac_core/px_mac_core.c	\
 	unixfuncs.c
 
-SRCS_MACOSX_VIDEO=				\
-	videoLib/macosx/macgrab.c		\
-	videoLib/macosx/vdigGrab.c		\
-	videoLib/macosx/vdigGrab.h
-
 SRCS_IAX2=					\
 	libiax2/src/md5.c			\
 	libiax2/src/iax.c			\

Modified: trunk/simpleclient/stresstest/Makefile.am
===================================================================
--- trunk/simpleclient/stresstest/Makefile.am	2007-10-22 02:36:41 UTC (rev 1220)
+++ trunk/simpleclient/stresstest/Makefile.am	2007-10-22 16:28:22 UTC (rev 1221)
@@ -10,6 +10,7 @@
 		-framework AudioUnit	\
 		-framework Carbon	\
 		-framework CoreAudio	\
+		-framework QuartzCore	\
 		-framework QuickTime
 endif
 


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