3 @@ -229,13 +229,16 @@ AX_COMPILER_VENDOR
4 if test "x${cross_compiling}" = "xyes"; then
5 CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
7 - arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
8 + arm*-linux-gnueabi*|arm*-*-linux-*)
10 ac_cv_file__dev_ptmx=yes
12 export ac_cv_va_copy=yes
14 + export ac_cv_dev_urandom=yes
16 export ac_cv_file__dev_urandom=yes
17 + export ac_cv_file___dev_urandom_=yes
19 export ac_cv_func_realloc_0_nonnull=yes
20 export ac_cv_func_malloc_0_nonnull=yes
21 @@ -378,9 +381,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
22 elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
23 APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
24 APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
25 - if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
26 - APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
28 if test "${enable_64}" = "yes"; then
30 *darwin12.*|*darwin11.*|*darwin10.*|*darwin9.*|*darwin8.*)
31 @@ -839,7 +839,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
33 AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
35 -AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
36 AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
38 AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
39 @@ -1163,14 +1162,14 @@ case $host in
43 -if ! (test -x "$PKG_CONFIG" || test -x "$(which pkg-config)"); then
44 - AC_MSG_ERROR([You need to install pkg-config to configure FreeSWITCH.])
45 +if ! test -x "${STAGING_DIR}/../host/bin/pkg-config"; then
46 + AC_MSG_ERROR([Missing tools/pkg-config package needed to configure FreeSWITCH.])
49 -# temporary workaround for Debian libldns-dev package bug
50 -if test "$cross_compiling" != "yes" && test -f /usr/lib/pkg-config/libldns.pc; then
51 - path_push_unique PKG_CONFIG_PATH /usr/lib/pkg-config
54 +# Workaround for OpenWRT pkg-config
56 +path_push_unique PKG_CONFIG_PATH ${STAGING_DIR}/usr/lib/pkg-config
59 grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
60 @@ -1191,7 +1190,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.
61 AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns])
62 AS_IF([test -z "$LDNS_LIBS"],[
63 if module_enabled mod_enum; then
64 - AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf])
65 + AC_MSG_ERROR([You need to either install libldns or disable mod_enum in modules.conf])
67 AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
69 @@ -1269,18 +1268,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
73 -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
75 -# -a "x$ac_cv_have_EXTERN_h" != "xno"
76 +AC_CHECK_PROG([PERL],[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
77 +PERL=$as_dir/$ac_word$ac_exec_ext
79 if test "x$ac_cv_have_perl" != "xno"; then
81 - PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
82 - PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
83 - PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
84 - PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
85 - PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
86 - PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
87 + PERL_SITELIB="/usr/lib/perl5/5.20"
88 + PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}"
89 + PERL_COREDIR="${PERL_SITEDIR}/CORE"
90 + PERL_INC="-I${PERL_COREDIR}"
91 + PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL"
92 + PERL_LIBDIR="-L${PERL_COREDIR}"
93 + PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc "
94 + PERL_LDFLAGS="${LDFLAGS} -lpthread ${PERL_LIBS}"
98 @@ -1293,12 +1292,15 @@ if test "x$ac_cv_have_perl" != "xno"; th
99 AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
100 LDFLAGS="$save_LDFLAGS"
102 - AC_SUBST(PERL_SITEDIR)
103 - AC_SUBST(PERL_LIBDIR)
104 - AC_SUBST(PERL_LIBS)
106 AC_SUBST(PERL_CFLAGS)
107 - AC_SUBST(PERL_LDFLAGS)
108 + AC_SUBST(PERL_COREDIR)
110 + AC_SUBST(PERL_LDFLAGS)
111 + AC_SUBST(PERL_LIBDIR)
112 + AC_SUBST(PERL_LIBS)
113 + AC_SUBST(PERL_SITEDIR)
114 + AC_SUBST(PERL_SITELIB)
117 AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
118 @@ -1307,17 +1309,19 @@ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_c
122 -AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
123 -AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
124 +AC_CHECK_PROG([PHP],[php],[ac_cv_have_php=yes],[ac_cv_have_php=no],[${STAGING_DIR}/../host/usr/bin:/usr/bin])
125 +PHP=$as_dir/$ac_word$ac_exec_ext
127 +AC_CHECK_PROG([PHP_CONFIG],[php-config],[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/../host/usr/bin])
128 +PHP_CONFIG=$as_dir/$ac_word$ac_exec_ext
130 AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
132 if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
134 - PHP_CONFIG=php-config
135 PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
136 - PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
137 + PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypt(o|))//g;s/^/-lcrypto/g'`"
138 PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
139 - PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
140 + PHP_INC_DIR="`$PHP_CONFIG --include-dir`"
141 PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
142 PHP_CFLAGS="`$PHP_CONFIG --includes`"
143 AC_SUBST(PHP_LDFLAGS)
144 @@ -1389,8 +1393,8 @@ then
145 # python distutils found, get settings from python directly
147 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'`"
148 - 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));'`"
149 - PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
150 + 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));'`"
151 + PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\") + \"m\");'`"
152 PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
154 # handle python being installed into /usr/local
155 @@ -1425,6 +1429,7 @@ then
156 AC_MSG_NOTICE([Your python seems OK, do not forget to enable mod_python in modules.conf])
157 AC_SUBST([PYTHON_CFLAGS], [$PYTHON_CFLAGS])
158 AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS])
159 + AC_SUBST([PYTHON_LIB], [$PYTHON_LIB])
162 AS_IF([test "$with_python" = "try"],