Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

FS-6604: install to archlib not sitelibexp

This commit is contained in:
Michael Jerris 2014-06-17 10:35:17 -05:00
parent b8629901a2
commit 82dbc5d2b9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1230,17 +1230,23 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"])
# #
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])
AC_CHECK_HEADER([EXTERN.h], [ac_cv_have_EXTERN_h=yes], [ac_cv_have_EXTERN_h=no])
AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
if test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"; then # -a "x$ac_cv_have_EXTERN_h" != "xno"
if test "x$ac_cv_have_perl" != "xno"; then
PERL=perl PERL=perl
PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{sitelibexp}'`" PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE" PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`" PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts` -DEMBED_PERL" PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts` -DEMBED_PERL"
PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`" PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`" PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$PERL_CFLAGS $CPPFLAGS"
AC_CHECK_HEADER([EXTERN.h], [ac_cv_have_EXTERN_h=yes], [ac_cv_have_EXTERN_h=no])
CPPFLAGS="$save_CPPFLAGS"
AC_SUBST(PERL_SITEDIR) AC_SUBST(PERL_SITEDIR)
AC_SUBST(PERL_LIBDIR) AC_SUBST(PERL_LIBDIR)
AC_SUBST(PERL_LIBS) AC_SUBST(PERL_LIBS)
@ -1249,6 +1255,8 @@ if test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"; then
AC_SUBST(PERL_INC) AC_SUBST(PERL_INC)
fi fi
AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
# #
# php checks # php checks
# #

1
src/mod/endpoints/mod_verto/Makefile.am
View File

@ -20,6 +20,7 @@ MCAST_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS
install-data-local: perlmod-install install-data-local: perlmod-install
perlmod-install: install-perlLTLIBRARIES perlmod-install: install-perlLTLIBRARIES
install -m 755 $(PERL_SITEDIR)
install -m 755 mcast/MCAST.pm $(PERL_SITEDIR) install -m 755 mcast/MCAST.pm $(PERL_SITEDIR)
endif endif