From: Mazi Lo <openwrt.mazilo@recursor.net>
Date: Thu, 23 Oct 2014 19:14:01 +0000 (-0400)
Subject: FreeSWITCH:
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1ba02cf25c4ae6c0c080143ec47d4745c5c71649;p=feed%2Ftelephony.git

FreeSWITCH:

1. Partially revert previous commit (11c475ad4) for python detection
   in configure.ac scripts.

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
---

diff --git a/net/freeswitch/patches/0000010-configure_ac.patch b/net/freeswitch/patches/0000010-configure_ac.patch
index 6b721ca..02d050e 100644
--- a/net/freeswitch/patches/0000010-configure_ac.patch
+++ b/net/freeswitch/patches/0000010-configure_ac.patch
@@ -141,17 +141,6 @@
     PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
     PHP_CFLAGS="`$PHP_CONFIG --includes`"
     AC_SUBST(PHP_LDFLAGS)
-@@ -1389,8 +1393,8 @@ then
- 			# python distutils found, get settings from python directly
- 			#
- 			PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
--			PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`"
--			PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
-+			PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")\"m\"); print(\" \".join(libs));'`"
-+			PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\") + \"m\");'`"
- 			PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
- 
- 			# handle python being installed into /usr/local
 @@ -1425,6 +1429,7 @@ then
  				AC_MSG_NOTICE([Your python seems OK, do not forget to enable mod_python in modules.conf])
  				AC_SUBST([PYTHON_CFLAGS],  [$PYTHON_CFLAGS])