? linphone-1.7.0.tar.gz ? linphone-external-ortp.diff ? linphone.out ? gtk/.deps ? gtk/.libs ? gtk/GNOME_LinphoneApplet.server ? gtk/GNOME_LinphoneApplet.server.in ? gtk/Makefile ? gtk/Makefile.in ? gtk/linphone ? gtk/linphone_applet ? m4/ortp.m4 ? m4/osip.m4-pat ? mediastreamer2/build/win32-novideo/Makefile ? oRTP/doc ? oRTP/ortp.doxygen ? po/stamp-it Index: Makefile.am =================================================================== RCS file: /sources/linphone/linphone/Makefile.am,v retrieving revision 1.48 diff -u -3 -p -r1.48 Makefile.am --- Makefile.am 7 Feb 2007 09:11:09 -0000 1.48 +++ Makefile.am 7 Apr 2007 20:54:36 -0000 @@ -3,7 +3,13 @@ # let make re-run automake upon need ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\ +if EXTERNAL_ORTP +ORTP_DIR = +else +ORTP_DIR = oRTP +endif + +SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) gsmlib mediastreamer2\ media_api exosip coreapi console gtk share Index: configure.in =================================================================== RCS file: /sources/linphone/linphone/configure.in,v retrieving revision 1.210 diff -u -3 -p -r1.210 configure.in --- configure.in 26 Mar 2007 13:21:35 -0000 1.210 +++ configure.in 7 Apr 2007 20:54:37 -0000 @@ -278,7 +278,7 @@ fi AC_SUBST(STRICT_OPTIONS) -AC_CONFIG_SUBDIRS( oRTP mediastreamer2 ) +AC_CONFIG_SUBDIRS( mediastreamer2 ) dnl check for db2html (docbook) to generate html user manual AC_CHECK_PROG(have_db2html,db2html, yes, no) @@ -291,9 +291,32 @@ AC_SUBST(LINPHONE_CFLAGS) AC_SUBST(LINPHONE_LIBS) - AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number]) + +AC_ARG_ENABLE(external-ortp, + [ --enable-external-ortp Use external oRTP library], + [case "${enableval}" in + yes) external_ortp=true ;; + no) external_ortp=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-ortp) ;; + esac],[external_ortp=false]) + +if test "$external_ortp" = 'true'; then + LP_CHECK_ORTP +else + AC_CONFIG_SUBDIRS( oRTP ) + ORTP_CFLAGS="-I\$(top_srcdir)/oRTP/include" + ORTP_LIBS="\$(top_builddir)/oRTP/src/libortp.la" + if test x$ac_cv_c_bigendian = xyes ; then + ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN" + fi +fi +AC_SUBST(ORTP_CFLAGS) +AC_SUBST(ORTP_LIBS) + +AM_CONDITIONAL(EXTERNAL_ORTP, [test "$external_ortp" = 'true']) + dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac dnl Feel free to propose an alternative & cleaner version... top_srcdir=`dirname $0` Index: console/Makefile.am =================================================================== RCS file: /sources/linphone/linphone/console/Makefile.am,v retrieving revision 1.47 diff -u -3 -p -r1.47 Makefile.am --- console/Makefile.am 7 Feb 2007 09:11:09 -0000 1.47 +++ console/Makefile.am 7 Apr 2007 20:54:37 -0000 @@ -5,7 +5,7 @@ if BUILD_CONSOLE INCLUDES = \ -I$(top_srcdir)\ -I$(top_srcdir)/coreapi\ - -I$(top_srcdir)/oRTP/include \ + $(ORTP_CFLAGS) \ -I$(top_srcdir)/exosip \ -I$(top_srcdir)/mediastreamer2/include \ -I$(osip_prefix)/include @@ -35,7 +35,7 @@ AM_CFLAGS=$(STRICT_OPTIONS) -DENABLE_TR if ARMBUILD AM_LDFLAGS= $(top_builddir)/mediastreamer2/src/libquickstream.la \ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ - $(top_builddir)/oRTP/src/libortp.la \ + $(ORTP_LIBS) \ $(SPEEX_LIBS) \ $(OSIP_LIBS) endif Index: coreapi/Makefile.am =================================================================== RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v retrieving revision 1.40 diff -u -3 -p -r1.40 Makefile.am --- coreapi/Makefile.am 13 Feb 2007 21:31:01 -0000 1.40 +++ coreapi/Makefile.am 7 Apr 2007 20:54:37 -0000 @@ -8,7 +8,7 @@ linphone_include_HEADERS=linphonecore.h INCLUDES = \ -I$(top_srcdir)\ -I$(top_srcdir)/exosip\ - -I$(top_srcdir)/oRTP/include \ + $(ORTP_CFLAGS) \ -I$(top_srcdir)/mediastreamer2/include \ -I$(osip_prefix)/include/ Index: gnome/Makefile.am =================================================================== RCS file: /sources/linphone/linphone/gnome/Makefile.am,v retrieving revision 1.35 diff -u -3 -p -r1.35 Makefile.am --- gnome/Makefile.am 16 Feb 2007 15:04:31 -0000 1.35 +++ gnome/Makefile.am 7 Apr 2007 20:54:37 -0000 @@ -17,7 +17,7 @@ if BUILD_GNOME INCLUDES = \ -I$(top_srcdir)\ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/oRTP/include \ + $(ORTP_CFLAGS) \ -I$(top_srcdir)/coreapi \ -I$(top_srcdir)/mediastreamer2/include \ -I$(osip_prefix)/include Index: gtk/Makefile.am =================================================================== RCS file: /sources/linphone/linphone/gtk/Makefile.am,v retrieving revision 1.2 diff -u -3 -p -r1.2 Makefile.am --- gtk/Makefile.am 16 Feb 2007 15:04:31 -0000 1.2 +++ gtk/Makefile.am 7 Apr 2007 20:54:37 -0000 @@ -17,7 +17,7 @@ if BUILD_GTK INCLUDES = \ -I$(top_srcdir)\ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/oRTP/include \ + $(ORTP_CFLAGS) \ -I$(top_srcdir)/coreapi \ -I$(top_srcdir)/mediastreamer2/include \ -I$(osip_prefix)/include Index: media_api/Makefile.am =================================================================== RCS file: /sources/linphone/linphone/media_api/Makefile.am,v retrieving revision 1.9 diff -u -3 -p -r1.9 Makefile.am --- media_api/Makefile.am 18 Sep 2002 18:53:34 -0000 1.9 +++ media_api/Makefile.am 7 Apr 2007 20:54:37 -0000 @@ -24,8 +24,7 @@ address@hidden@ @SOUNDDEFS@ -DDEBUG -DG_LOG_ INCLUDES=-I$(top_srcdir)/mediastreamer \ -I$(top_srcdir)/speex \ -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/oRTP \ - -I$(top_srcdir)/oRTP/src \ + $(ORTP_CFLAGS) \ -I$(top_srcdir)/lpc10-1.5 \ -I$(top_srcdir)/ffmpeg Index: mediastreamer2/configure.ac =================================================================== RCS file: /sources/linphone/linphone/mediastreamer2/configure.ac,v retrieving revision 1.30 diff -u -3 -p -r1.30 configure.ac --- mediastreamer2/configure.ac 21 Feb 2007 21:30:13 -0000 1.30 +++ mediastreamer2/configure.ac 7 Apr 2007 20:54:37 -0000 @@ -295,14 +295,27 @@ AM_CONDITIONAL(BUILD_THEORA, test "$have dnl ********************************************* dnl setup oRTP dependency dnl ********************************************* -if test -e $srcdir/../oRTP/include/ortp/ortp.h ; then - echo "building from linphone source tree, using ../oRTP/include/ortp/ortp.h" - ORTP_CFLAGS="-I\$(top_srcdir)/../oRTP/include" - ORTP_LIBS="\$(top_builddir)/../oRTP/src/libortp.la" - if test x$ac_cv_c_bigendian = xyes ; then - ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN" +AC_ARG_ENABLE(external-ortp, + [ --enable-external-ortp Use external oRTP library], + [case "${enableval}" in + yes) external_ortp=true ;; + no) external_ortp=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-ortp) ;; + esac],[external_ortp=false]) + +if test "$external_ortp" = 'false'; then + if test -e $srcdir/../oRTP/include/ortp/ortp.h ; then + echo "building from linphone source tree, using ../oRTP/include/ortp/ortp.h" + ORTP_CFLAGS="-I\$(top_srcdir)/../oRTP/include" + ORTP_LIBS="\$(top_builddir)/../oRTP/src/libortp.la" + if test x$ac_cv_c_bigendian = xyes ; then + ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN" + fi + else + external_ortp=true fi -else +fi +if test "$external_ortp" = 'true'; then PKG_CHECK_MODULES(ORTP, ortp >= 0.9.0, , [ AC_MSG_ERROR([Couldn't find ortp library]) ] ) fi