Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 07d71d8..2344cdb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1802,8 +1802,9 @@ if test "x$with_libperl" = "xyes" \
 then
   SAVE_CFLAGS=$CFLAGS
   SAVE_LDFLAGS=$LDFLAGS
-  PERL_CFLAGS=`$perl_interpreter -MExtUtils::Embed -e ccopts`
-  PERL_LDFLAGS=`$perl_interpreter -MExtUtils::Embed -e ldopts`
+dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+  PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+  PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
   CFLAGS="$CFLAGS $PERL_CFLAGS"
   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
@@ -1880,7 +1881,7 @@ then
        LDFLAGS=$SAVE_LDFLAGS
 fi
 
-have_broken_perl_load_module="no"
+c_cv_have_broken_perl_load_module="no"
 if test "x$with_libperl" = "xyes"
 then
        SAVE_CFLAGS=$CFLAGS
@@ -1891,7 +1892,7 @@ then
        LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
        AC_CACHE_CHECK([for broken Perl_load_module()],
-               [have_broken_perl_load_module],
+               [c_cv_have_broken_perl_load_module],
                AC_LINK_IFELSE(
                        AC_LANG_PROGRAM(
                        [[
@@ -1906,8 +1907,8 @@ then
                             newSVpv ("Collectd::Plugin::FooBar", 24),
                             Nullsv);
                        ]]),
-                       [have_broken_perl_load_module="no"],
-                       [have_broken_perl_load_module="yes"]
+                       [c_cv_have_broken_perl_load_module="no"],
+                       [c_cv_have_broken_perl_load_module="yes"]
                )
        )
 
@@ -1915,7 +1916,7 @@ then
        LDFLAGS=$SAVE_LDFLAGS
 fi
 AM_CONDITIONAL(HAVE_BROKEN_PERL_LOAD_MODULE,
-               test "x$have_broken_perl_load_module" = "xyes")
+               test "x$c_cv_have_broken_perl_load_module" = "xyes")
 
 if test "x$with_libperl" = "xyes"
 then