[Lunar-commits] <moonbase> linphone: some changes here so linphone does not stomp on the ortp

[Dennis 'stumbles' Veatch]

commit a8083e1adf71628f92cd3636b45f5a45ebeb025d
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sun Jun 21 14:46:39 2009 -0400

    linphone: some changes here so linphone does not stomp on the ortp
    
    module libs and headers. The linphone configure is borked, if you use
    --enable-external-ortp, it will still over write external ortp with
    its own. A lunar fix only reveals libortp.a and libortp.la as sum
    mismatches. But the headers are as well.
---
 chat/linphone/BUILD |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/chat/linphone/BUILD b/chat/linphone/BUILD
index 7e4f914..f5fff9f 100644
--- a/chat/linphone/BUILD
+++ b/chat/linphone/BUILD
@@ -3,9 +3,15 @@
   # --enable-rsvp breaks the build, is no longer maintained, so don't 
   # use it.
 
-  OPTS="--enable-truespeech --enable-video"
+  OPTS="--enable-truespeech --enable-video --includedir=/usr/include/$module \
+       --libdir=/usr/lib/$MODULE"
 
   default_config &&
+  # So linphone does not stomp on the ortp module files.
+  cd oRTP        &&
+  OPTS="--libdir=/usr/lib/$MODULE --includedir=/usr/include/$MODULE"
+  default_config &&
+  cd .. &&
 
 # Something goes wonky when generating the Makefile as shown by this sedit.
   sedit "s:yes/:/:g" mediastreamer2/Makefile