3 @@ -360,7 +360,7 @@ elif test "x${ax_cv_c_compiler_vendor}"
4 elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
5 APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
6 APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
7 - APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
8 +# APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
9 if test "${enable_64}" = "yes"; then
11 *darwin12.*|*darwin11.*|*darwin10.*|*darwin9.*|*darwin8.*)
12 @@ -811,7 +811,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
14 AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
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()])])
19 AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
20 @@ -1241,36 +1240,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
24 -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
26 -# -a "x$ac_cv_have_EXTERN_h" != "xno"
27 +AC_CHECK_PROG([PERL],[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
29 if test "x$ac_cv_have_perl" != "xno"; then
31 - PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
32 - PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
33 - PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
34 - PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
35 - PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
36 - PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
37 + PERL="${STAGING_DIR}/../host/usr/bin/perl"
38 + #PERL_SITEDIR="`${PERL} -MConfig -e 'print $Config{installarchlib}'`"
39 + PERL_SITELIB="/usr/lib/perl5/5.20"
40 + PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}"
41 + PERL_COREDIR="${PERL_SITEDIR}/CORE"
42 + PERL_INC="-I${PERL_COREDIR}"
43 + #PERL_CFLAGS="-w -DMULTIPLICITY `${PERL} -MExtUtils::Embed -e ccopts` -DEMBED_PERL"
44 + PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL"
45 + PERL_LIBDIR="-L${PERL_COREDIR}"
46 + #PERL_LIBS="${PERL_LIBDIR} -lpthread `${PERL} -MConfig -e 'print $Config{libs}' | sed -e 's| -lgdbm_compat||g'` "
47 + #PERL_LDFLAGS="`${PERL} -MExtUtils::Embed -e ldopts | sed -e 's| -lgdbm_compat||g'` "
48 + PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc "
49 + PERL_LDFLAGS="${PERL_LIBDIR} -lpthread -lperl -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lrt "
52 - CFLAGS="$PERL_CFLAGS"
53 + CFLAGS="${PERL_CFLAGS}"
54 AC_CHECK_HEADER([EXTERN.h], [ac_cv_have_EXTERN_h=yes], [ac_cv_have_EXTERN_h=no], [[#include <EXTERN.h>
58 save_LDFLAGS="$LDFLAGS"
59 - LDFLAGS="$PERL_LDFLAGS"
60 + LDFLAGS="${PERL_LDFLAGS}"
61 AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
62 - LDFLAGS="$save_LDFLAGS"
63 + LDFLAGS+="$save_LDFLAGS"
65 - AC_SUBST(PERL_SITEDIR)
66 - AC_SUBST(PERL_LIBDIR)
70 - AC_SUBST(PERL_LDFLAGS)
71 + AC_SUBST(PERL_COREDIR)
73 + AC_SUBST(PERL_LDFLAGS)
74 + AC_SUBST(PERL_LIBDIR)
76 + AC_SUBST(PERL_SITEDIR)
77 + AC_SUBST(PERL_SITELIB)
80 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"])