Add FFI_LIBS to LIBS within configure if PKG_CHECK_MODULES succeeds. …

…This is in line with what happens

if PKG_CHECK_MODULES fails but AC_CHECK_LIB succeeds.


git-svn-id: svn://svn.code.sf.net/p/polyml/code/trunk/polyml@1983 ae7d391e-3f74-4a2b-a0db-a8776840fd2a

configure

@@ -19188,7 +19188,7 @@ else
 	FFI_LIBS=$pkg_cv_FFI_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	LIBS="$FFI_LIBS $LIBS" CFLAGS="$FFI_CFLAGS $CFLAGS"
 fi
 else
 # Use internal libffi

configure.ac

@@ -232,7 +232,8 @@ AC_ARG_WITH([system-libffi],
 
 # Libffi uses pkg-config.
 if test "x$with_system_libffi" = "xyes"; then
-    PKG_CHECK_MODULES([FFI], [libffi], [],
+    PKG_CHECK_MODULES([FFI], [libffi],
+        [LIBS="$FFI_LIBS $LIBS" CFLAGS="$FFI_CFLAGS $CFLAGS"],
         [AC_CHECK_LIB([ffi], [ffi_prep_closure_loc],
              [
                  [LIBS="-lffi $LIBS"]

libpolyml/Makefile.am

@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS=foreign
 
-AM_CPPFLAGS = $(FFI_CFLAGS) $(OSFLAG) -Wall
-AM_CFLAGS = $(FFI_CFLAGS) $(OSFLAG) -Wall -fno-strict-aliasing
+AM_CPPFLAGS = $(CFLAGS) $(OSFLAG) -Wall
+AM_CFLAGS = $(CFLAGS) $(OSFLAG) -Wall -fno-strict-aliasing
 AM_ASFLAGS = $(OSFLAG)
 AM_CCASFLAGS = $(OSFLAG)
 
@@ -10,8 +10,6 @@ libpolyml_la_LDFLAGS = -version-info 6:0:0
 
 if INTERNAL_LIBFFI
 libpolyml_la_LIBADD = ../libffi/libffi_convenience.la
-else
-libpolyml_la_LIBADD = $(FFI_LIBS)
 endif
 
 if NO_UNDEFINED

libpolyml/Makefile.in

@@ -100,9 +100,6 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@INTERNAL_LIBFFI_FALSE@libpolyml_la_DEPENDENCIES =  \
-@INTERNAL_LIBFFI_FALSE@	$(am__DEPENDENCIES_1)
 @INTERNAL_LIBFFI_TRUE@libpolyml_la_DEPENDENCIES =  \
 @INTERNAL_LIBFFI_TRUE@	../libffi/libffi_convenience.la
 am__libpolyml_la_SOURCES_DIST = arb.cpp basicio.cpp bitmap.cpp \
@@ -319,13 +316,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-AM_CPPFLAGS = $(FFI_CFLAGS) $(OSFLAG) -Wall
-AM_CFLAGS = $(FFI_CFLAGS) $(OSFLAG) -Wall -fno-strict-aliasing
+AM_CPPFLAGS = $(CFLAGS) $(OSFLAG) -Wall
+AM_CFLAGS = $(CFLAGS) $(OSFLAG) -Wall -fno-strict-aliasing
 AM_ASFLAGS = $(OSFLAG)
 AM_CCASFLAGS = $(OSFLAG)
 lib_LTLIBRARIES = libpolyml.la
 libpolyml_la_LDFLAGS = -version-info 6:0:0 $(am__append_1)
-@INTERNAL_LIBFFI_FALSE@libpolyml_la_LIBADD = $(FFI_LIBS)
 @INTERNAL_LIBFFI_TRUE@libpolyml_la_LIBADD = ../libffi/libffi_convenience.la
 @ARCHI386_FALSE@@ARCHINTERPRET64_FALSE@@ARCHINTERPRET_FALSE@@ARCHX86_64_TRUE@ARCHSOURCE = x86_dep.cpp x86asmtemp.S
 @ARCHI386_FALSE@@ARCHINTERPRET64_TRUE@@ARCHINTERPRET_FALSE@ARCHSOURCE = interpret.cpp

polyc.in

@@ -4,7 +4,7 @@ exec_prefix=@exec_prefix@
 BINDIR=@bindir@
 LINK=@CC@
 LIBDIR=@libdir@
-LIBS="@LIBS@ @FFI_LIBS@"
+LIBS="@LIBS@"
 CFLAGS="@CFLAGS@"
 
 # Extra options for Windows.  config.status sets these conditionals to either "" or "#".