r3425 - trunk/libminisip

[mikma at minisip.org]

Author: mikma
Date: 2007-09-10 13:43:11 +0200 (Mon, 10 Sep 2007)
New Revision: 3425

Modified:
   trunk/libminisip/Makefile.am
   trunk/libminisip/configure.ac
Log:
libminisip
==========

configure.ac
------------
* Check for img_convert in libavcoded, required for
  video features. This function is removed in current CVS versions, for
  example packaged by debian-multimedia.org.

Makefile.am
-----------
* Fix libmsrp_src warning.

* Add MINISIP_LIBRARY_LDFLAGS to libminisip_video LDFLAGS. Undefined
  symbols will be detected during linking.

* Add libminisip.la and MUTIL_LIBS to libminisip_video LIBADD. Link
  against required libraries.



Modified: trunk/libminisip/Makefile.am
===================================================================
--- trunk/libminisip/Makefile.am	2007-09-07 09:11:14 UTC (rev 3424)
+++ trunk/libminisip/Makefile.am	2007-09-10 11:43:11 UTC (rev 3425)
@@ -102,10 +102,9 @@
 			source/subsystem_signaling/p2t/P2T.cxx
 endif
 
-libmsrp_src = 
 if MSRP_SUPPORT
 libmsrp_src = source/subsystem_media/msrp/MSRPMessage.cxx \
- 		source/subsystem_media/msrp/MSRPMessage.h \
+		source/subsystem_media/msrp/MSRPMessage.h \
 		source/subsystem_signaling/sip/SipDialogFileTransferClient.cxx \
 		source/subsystem_signaling/sip/SipDialogFileTransferClient.h \
 		source/subsystem_signaling/sip/SipDialogFileTransferServer.cxx \
@@ -254,9 +253,11 @@
 lib_LTLIBRARIES += libminisip_video.la
 libminisip_video_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVCODEC_CPPFLAGS)	\
 		$(FFMPEG_CFLAGS)
-libminisip_video_la_LDFLAGS = $(AVCODEC_LDFLAGS)
+libminisip_video_la_LDFLAGS = $(MINISIP_LIBRARY_LDFLAGS)	\
+		$(RELOC_LDFLAGS) $(AVCODEC_LDFLAGS)
 libminisip_video_la_SOURCES = $(libvideo_src)
-libminisip_video_la_LIBADD = $(libvideo_libadd) $(FFMPEG_LIBS)
+libminisip_video_la_LIBADD = $(libvideo_libadd) $(FFMPEG_LIBS)	\
+		libminisip.la $(MUTIL_LIBS)
 
 plugins_LTLIBRARIES += mvideo.la
 mvideo_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVCODEC_CPPFLAGS) $(FFMPEG_CFLAGS)

Modified: trunk/libminisip/configure.ac
===================================================================
--- trunk/libminisip/configure.ac	2007-09-07 09:11:14 UTC (rev 3424)
+++ trunk/libminisip/configure.ac	2007-09-10 11:43:11 UTC (rev 3425)
@@ -314,6 +314,9 @@
 	  AC_CHECK_LIB([avcodec], [main], [], [AC_MSG_ERROR(
 	    [Could not locate libavcodec, required for video features.])])
 
+	  AC_CHECK_FUNCS([img_convert], [], [AC_MSG_ERROR(
+	    [Could not find img_convert in libavcodec, required for video features.])])
+
 	  AC_CHECK_LIB([z], [main], [], [AC_MSG_ERROR(
 	    [Could not find zlib, required by libavcodec.])])