From 82dbc5d2b9bf5971aa8c9b0069cecda5630c96ef Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 17 Jun 2014 10:35:17 -0500
Subject: [PATCH] FS-6604: install to archlib not sitelibexp

---
 configure.ac                            | 16 ++++++++++++----
 src/mod/endpoints/mod_verto/Makefile.am |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f41339adee..635b3d1950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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_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_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_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
    PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts` -DEMBED_PERL"
    PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
    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_LIBDIR)
    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)
 fi
 
+AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
+
 #
 # php checks
 #
diff --git a/src/mod/endpoints/mod_verto/Makefile.am b/src/mod/endpoints/mod_verto/Makefile.am
index 00744270bc..56d0bd4048 100644
--- a/src/mod/endpoints/mod_verto/Makefile.am
+++ b/src/mod/endpoints/mod_verto/Makefile.am
@@ -20,6 +20,7 @@ MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS
 install-data-local: perlmod-install
 
 perlmod-install: install-perlLTLIBRARIES
+	install -m 755 $(PERL_SITEDIR)
 	install -m 755 mcast/MCAST.pm $(PERL_SITEDIR)
 endif