+++ /dev/null
---- a/build/config/erlang.m4
-+++ b/build/config/erlang.m4
-@@ -1,6 +1,6 @@
- AC_DEFUN([CHECK_ERLANG], [
- #
--# Erlang checks for mod_erlang_event
-+# Erlang check
- #
- AC_ARG_WITH(
- [erlang],
-@@ -20,22 +20,23 @@ then
- if test ! -x "$with_erlang" ; then
- AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
- fi
-- AC_MSG_RESULT([$with_erlang])
-- AC_SUBST([ERLANG], ["$with_erlang"])
-+ AC_MSG_RESULT(["$with_erlang/bin/erl"])
-+ AC_SUBST([ERL],["$with_erlang/bin/erl"])
- else
-- AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+ AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
- fi
-
-- if test "$ERLANG" != "no" ; then
-+ if test "$ERL" != "no" ; then
- AC_MSG_CHECKING([erlang version])
-- ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
-+ ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
-
- if test -z "$ERLANG_VER" ; then
- AC_MSG_ERROR([Unable to detect erlang version])
-+ else
-+ AC_MSG_RESULT([$ERLANG_VER])
- fi
-- AC_MSG_RESULT([$ERLANG_VER])
-
-- ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+ ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
- AC_MSG_CHECKING([erlang libdir])
- if test -z "`echo $ERLANG_LIBDIR`" ; then
- AC_MSG_ERROR([failed])
-@@ -43,9 +44,16 @@ then
- ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
- LIBS="-L$ERLANG_LIBDIR $LIBS"
- fi
-+
-+ #
-+ # Don't use the above ERLANG_LDFLAGS
-+ #
-+ ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
-+ ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
-+ LIBS="-L$ERLANG_LIBDIR $LIBS"
- AC_MSG_RESULT([$ERLANG_LIBDIR])
-
-- ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+ ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
- AC_MSG_CHECKING([erlang incdir])
- if test -z "`echo $ERLANG_INCDIR`" ; then
- AC_MSG_ERROR([failed])
-@@ -59,10 +67,11 @@ then
-
- ERLANG_LIB="ei"
-
-- # check liei
-+ # check libei
- AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
- # maybe someday ei will actually expose this?
-- AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-+ # until then, we comment it out
-+ #AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-
- if test "$has_libei" = "no" ; then
- AS_IF([test "$with_erlang" = "try"],
-@@ -76,7 +85,7 @@ then
- )
- else
- ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
-- AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
-+ AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
- AC_SUBST([ERLANG_CFLAGS], [$ERLANG_CFLAGS])
- AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
- AM_CONDITIONAL([HAVE_ERLANG],[true])
-@@ -87,12 +96,12 @@ then
-
- else
- AS_IF([test "$with_erlang" = "try"],
-- [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
-+ [AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
- [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
- )
- fi
- else
-- AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
-+ AC_MSG_WARN([erlang support disabled!])
- fi
-
- ])
+++ /dev/null
---- a/build/modules.conf.in
-+++ b/build/modules.conf.in
-@@ -38,6 +38,7 @@ applications/mod_httapi
- #applications/mod_rad_auth
- #applications/mod_redis
- #applications/mod_rss
-+#applications/mod_skel
- applications/mod_sms
- #applications/mod_snapshot
- #applications/mod_snom
+++ /dev/null
---- /dev/null
-+++ b/build/openwrt_rules.mk
-@@ -0,0 +1,7 @@
-+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
-+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
-+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
-+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
-+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
-+
-+include $(OPENWRT_DIR)/rules.mk
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -254,7 +254,7 @@ AX_COMPILER_VENDOR
- if test "x${cross_compiling}" = "xyes"; then
- CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
- case "$host" in
-- arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
-+ arm*-linux-gnueabi*|arm*-*-linux-*)
- # spandsp modem
- ac_cv_file__dev_ptmx=yes
- # libjs
-@@ -273,7 +273,7 @@ if test "x${cross_compiling}" = "xyes";
- export apr_cv_mutex_recursive=yes
- export ac_cv_func_pthread_rwlock_init=yes
- export apr_cv_type_rwlock_t=yes
-- export apr_cv_process_shared_works=yes
-+ export apr_cv_process_shared_works=no
- export apr_cv_mutex_robust_shared=yes
- ;;
- esac
-@@ -405,9 +405,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
- APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
- APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
-- if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
-- APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
-- fi
- if test "${enable_64}" = "yes"; then
- case "$host" in
- *darwin*)
-@@ -901,7 +898,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
-
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
-
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
-
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
-@@ -1474,14 +1470,14 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
- # perl checks
- #
-
--AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
-+AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
-+PERL=$as_dir/$ac_word$ac_exec_ext
-
- # -a "x$ac_cv_have_EXTERN_h" != "xno"
-
- if test "x$ac_cv_have_perl" != "xno"; then
-- PERL=perl
-- PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
-- PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
-+ PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
-+ PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/CORE"
- PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
- PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
- PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
-@@ -1498,6 +1494,7 @@ if test "x$ac_cv_have_perl" != "xno"; th
- AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
- LDFLAGS="$save_LDFLAGS"
-
-+ AC_SUBST(PERL)
- AC_SUBST(PERL_SITEDIR)
- AC_SUBST(PERL_LIBDIR)
- AC_SUBST(PERL_LIBS)
+++ /dev/null
---- a/libs/apr/configure.ac
-+++ b/libs/apr/configure.ac
-@@ -1956,7 +1956,11 @@ fi
-
- APR_CHECK_TCP_NODELAY_INHERITED
- APR_CHECK_O_NONBLOCK_INHERITED
--APR_CHECK_TCP_NODELAY_WITH_CORK
-+
-+dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
-+if test "$cross_compiling" != yes; then
-+ APR_CHECK_TCP_NODELAY_WITH_CORK
-+fi
-
- # Look for a way of corking TCP...
- APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
+++ /dev/null
---- a/libs/apr-util/configure.gnu
-+++ b/libs/apr-util/configure.gnu
-@@ -1,4 +1,4 @@
- #! /bin/sh
- srcpath=$(dirname $0 2>/dev/null ) || srcpath="."
--$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
-+$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
-
+++ /dev/null
---- a/libs/srtp/configure.ac
-+++ b/libs/srtp/configure.ac
-@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
- fi
- AC_MSG_RESULT($enable_kernel_linux)
-
--dnl Check for /dev/urandom
--AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
-- [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
--
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(stdlib.h)