Code

Merge pull request #390 from radford/libperl-ldopts
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Feb 2015 15:31:26 +0000 (16:31 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Feb 2015 15:31:26 +0000 (16:31 +0100)
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

1  2 
configure.ac

diff --combined configure.ac
index 6779f4b190a90548b8df291f5decae69f2f521a8,3204e28eeef9d8fd136e160151717f90a3066eee..f2d7ebdb11e3b2259f3febb7c62425136a594a9a
@@@ -3219,12 -3219,12 +3219,12 @@@ if test "x$with_libperl" = "xyes" 
        && test -n "$perl_interpreter"
  then
    SAVE_CFLAGS="$CFLAGS"
-   SAVE_LDFLAGS="$LDFLAGS"
+   SAVE_LIBS="$LIBS"
  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`
+   PERL_LIBS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
    CFLAGS="$CFLAGS $PERL_CFLAGS"
-   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+   LIBS="$LIBS $PERL_LIBS"
  
    AC_CACHE_CHECK([for libperl],
      [c_cv_have_libperl],
    then
          AC_DEFINE(HAVE_LIBPERL, 1, [Define if libperl is present and usable.])
          AC_SUBST(PERL_CFLAGS)
-         AC_SUBST(PERL_LDFLAGS)
+         AC_SUBST(PERL_LIBS)
    else
          with_libperl="no"
    fi
  
    CFLAGS="$SAVE_CFLAGS"
-   LDFLAGS="$SAVE_LDFLAGS"
+   LIBS="$SAVE_LIBS"
  else if test -z "$perl_interpreter"; then
    with_libperl="no (no perl interpreter found)"
    c_cv_have_libperl="no"
@@@ -3267,9 -3267,9 +3267,9 @@@ AM_CONDITIONAL(BUILD_WITH_LIBPERL, tes
  if test "x$with_libperl" = "xyes"
  then
        SAVE_CFLAGS="$CFLAGS"
-       SAVE_LDFLAGS="$LDFLAGS"
+       SAVE_LIBS="$LIBS"
        CFLAGS="$CFLAGS $PERL_CFLAGS"
-       LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+       LIBS="$LIBS $PERL_LIBS"
  
        AC_CACHE_CHECK([if perl supports ithreads],
                [c_cv_have_perl_ithreads],
        fi
  
        CFLAGS="$SAVE_CFLAGS"
-       LDFLAGS="$SAVE_LDFLAGS"
+       LIBS="$SAVE_LIBS"
  fi
  
  if test "x$with_libperl" = "xyes"
  then
        SAVE_CFLAGS="$CFLAGS"
-       SAVE_LDFLAGS="$LDFLAGS"
+       SAVE_LIBS="$LIBS"
        # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
        # (see issues #41 and #42)
        CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
-       LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+       LIBS="$LIBS $PERL_LIBS"
  
        AC_CACHE_CHECK([for broken Perl_load_module()],
                [c_cv_have_broken_perl_load_module],
        )
  
        CFLAGS="$SAVE_CFLAGS"
-       LDFLAGS="$SAVE_LDFLAGS"
+       LIBS="$SAVE_LIBS"
  fi
  AM_CONDITIONAL(HAVE_BROKEN_PERL_LOAD_MODULE,
                test "x$c_cv_have_broken_perl_load_module" = "xyes")
  if test "x$with_libperl" = "xyes"
  then
        SAVE_CFLAGS="$CFLAGS"
-       SAVE_LDFLAGS="$LDFLAGS"
+       SAVE_LIBS="$LIBS"
        CFLAGS="$CFLAGS $PERL_CFLAGS"
-       LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+       LIBS="$LIBS $PERL_LIBS"
  
        AC_CHECK_MEMBER(
                [struct mgvtbl.svt_local],
        fi
  
        CFLAGS="$SAVE_CFLAGS"
-       LDFLAGS="$SAVE_LDFLAGS"
+       LIBS="$SAVE_LIBS"
  fi
  # }}}
  
  if test "x$with_libstatgrab" = "xyes"
  then
    SAVE_CFLAGS="$CFLAGS"
 -  SAVE_LDFLAGS="$LDFLAGS"
 +  SAVE_LIBS="$LIBS"
  
    CFLAGS="$CFLAGS $with_libstatgrab_cflags"
    LDFLAGS="$LDFLAGS $with_libstatgrab_ldflags"
 +  LIBS="-lstatgrab $LIBS"
  
    AC_CACHE_CHECK([if libstatgrab >= 0.90],
            [c_cv_have_libstatgrab_0_90],
  
    CFLAGS="$SAVE_CFLAGS"
    LDFLAGS="$SAVE_LDFLAGS"
 +  LIBS="$SAVE_LIBS"
  fi
  
  AM_CONDITIONAL(BUILD_WITH_LIBSTATGRAB, test "x$with_libstatgrab" = "xyes")