summaryrefslogtreecommitdiff
path: root/packages/linphone/linphone-1.3.99.8
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-08-06 13:18:48 +0000
committerKristoffer Ericson <kristoffer_e1@hotmail.com>2006-08-06 13:18:48 +0000
commite46b9eb91fa93a94580e274719f4c7d713eae6e2 (patch)
tree0ba031ced9e23fd5b6a127d62ed3aee4cd5db941 /packages/linphone/linphone-1.3.99.8
parent3b3ac6317c6798718c88e636c769e2ae3a578ab3 (diff)
parent8f6d28b3d4b15086e6f21011e0f25d0f7c6f7235 (diff)
merge of 235bdc3ae0f87feaab2e0933bfdb44645a492c5e
and 2ec546354ed54e5800bc57d56a12bbe7ecb4ccdd
Diffstat (limited to 'packages/linphone/linphone-1.3.99.8')
-rw-r--r--packages/linphone/linphone-1.3.99.8/.mtn2git_empty0
-rw-r--r--packages/linphone/linphone-1.3.99.8/conf.patch33
2 files changed, 33 insertions, 0 deletions
diff --git a/packages/linphone/linphone-1.3.99.8/.mtn2git_empty b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty
diff --git a/packages/linphone/linphone-1.3.99.8/conf.patch b/packages/linphone/linphone-1.3.99.8/conf.patch
new file mode 100644
index 0000000000..e8fbdf22c8
--- /dev/null
+++ b/packages/linphone/linphone-1.3.99.8/conf.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -30,7 +30,7 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ dnl localization tools
+-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
++dnl ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
+ dnl Initialize libtool
+ AC_PROG_LIBTOOL
+ AM_PROG_LIBTOOL
+@@ -62,7 +62,7 @@
+ gnome_ui=false
+ fi
+
+-CFLAGS="$CFLAGS -I\$(prefix)/include"
++dnl CFLAGS="$CFLAGS -I\$(prefix)/include"
+
+ if test "$gnome_ui" = "true" ; then
+
+--- a/mediastreamer2/configure.ac
++++ b/mediastreamer2/configure.ac
+@@ -47,8 +47,8 @@
+ [wall_werror=yes]
+ )
+
+-CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include"
+-LIBS="$LIBS -L\$(prefix)/lib"
++dnl CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include"
++dnl LIBS="$LIBS -L\$(prefix)/lib"
+
+ dnl enable ipv6 support
+ AC_ARG_ENABLE(ipv6,