net/freeswitch/patches/0000010-configure_ac.patch

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