net/freeswitch/patches/0000010-configure_ac.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -229,7 +229,7 @@ AX_COMPILER_VENDOR
   4  if test "x${cross_compiling}" = "xyes"; then
   5      CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   6      case "$host" in
   7 -        arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
   8 +        arm*-linux-gnueabi*|arm*-*-linux-*)
   9                 # spandsp modem
  10                 ac_cv_file__dev_ptmx=yes
  11                 # libjs
  12 @@ -839,7 +839,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
  13
  14  AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
  15
  16 -AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
  17  AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
  18
  19  AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
  20 @@ -1163,14 +1162,14 @@ case $host in
  21         ;;
  22  esac
  23
  24 -if ! (test -x "$PKG_CONFIG" || test -x "$(which pkg-config)"); then
  25 -  AC_MSG_ERROR([You need to install pkg-config to configure FreeSWITCH.])
  26 +if ! test -x "${STAGING_DIR}/../host/bin/pkg-config"; then
  27 +  AC_MSG_ERROR([Missing tools/pkg-config package needed to configure FreeSWITCH.])
  28  fi
  29
  30 -# temporary workaround for Debian libldns-dev package bug
  31 -if test "$cross_compiling" != "yes" && test -f /usr/lib/pkg-config/libldns.pc; then
  32 -  path_push_unique PKG_CONFIG_PATH /usr/lib/pkg-config
  33 -fi
  34 +#
  35 +# Workaround for OpenWRT pkg-config
  36 +#
  37 +path_push_unique PKG_CONFIG_PATH ${STAGING_DIR}/usr/lib/pkg-config
  38
  39  module_enabled() {
  40    grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
  41 @@ -1191,7 +1190,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.
  42    AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns])
  43    AS_IF([test -z "$LDNS_LIBS"],[
  44      if module_enabled mod_enum; then
  45 -      AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf])
  46 +      AC_MSG_ERROR([You need to either install libldns or disable mod_enum in modules.conf])
  47      else
  48        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
  49      fi],[
  50 @@ -1269,36 +1268,39 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
  51  # perl checks
  52  #
  53
  54 -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
  55 -
  56 -# -a "x$ac_cv_have_EXTERN_h" != "xno"
  57 +AC_CHECK_PROG([PERL],[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
  58
  59  if test "x$ac_cv_have_perl" != "xno"; then
  60 -   PERL=perl
  61 -   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
  62 -   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
  63 -   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
  64 -   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
  65 -   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
  66 -   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
  67 +   PERL="${STAGING_DIR}/../host/usr/bin/perl"
  68 +   PERL_SITELIB="/usr/lib/perl5/5.20"
  69 +   PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}"
  70 +   PERL_COREDIR="${PERL_SITEDIR}/CORE"
  71 +   PERL_INC="-I${PERL_COREDIR}"
  72 +   PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL"
  73 +   PERL_LIBDIR="-L${PERL_COREDIR}"
  74 +   PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc "
  75 +   PERL_LDFLAGS="${LDFLAGS} -lpthread ${PERL_LIBS}"
  76
  77     save_CFLAGS="$CFLAGS"
  78 -   CFLAGS="$PERL_CFLAGS"
  79 +   CFLAGS="${PERL_CFLAGS}"
  80     AC_CHECK_HEADER([EXTERN.h], [ac_cv_have_EXTERN_h=yes], [ac_cv_have_EXTERN_h=no], [[#include <EXTERN.h>
  81  # include <perl.h>]])
  82     CFLAGS="$save_CFLAGS"
  83
  84     save_LDFLAGS="$LDFLAGS"
  85 -   LDFLAGS="$PERL_LDFLAGS"
  86 +   LDFLAGS="${PERL_LDFLAGS}"
  87     AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
  88     LDFLAGS="$save_LDFLAGS"
  89
  90 -   AC_SUBST(PERL_SITEDIR)
  91 -   AC_SUBST(PERL_LIBDIR)
  92 -   AC_SUBST(PERL_LIBS)
  93 +   AC_SUBST(PERL)
  94     AC_SUBST(PERL_CFLAGS)
  95 -   AC_SUBST(PERL_LDFLAGS)
  96 +   AC_SUBST(PERL_COREDIR)
  97     AC_SUBST(PERL_INC)
  98 +   AC_SUBST(PERL_LDFLAGS)
  99 +   AC_SUBST(PERL_LIBDIR)
 100 +   AC_SUBST(PERL_LIBS)
 101 +   AC_SUBST(PERL_SITEDIR)
 102 +   AC_SUBST(PERL_SITELIB)
 103  fi
 104
 105  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"])