From b6efdff4ec2e68ba5dd7e45639ff992e35cb6045 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 14 Apr 2011 10:49:13 -0600
Subject: [PATCH] configure: -lffi goes in LIBS, not LDFLAGS

---
 src/configure           | 14 +++++++-------
 src/racket/configure.ac | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/configure b/src/configure
index a4f2044878..ed1af281db 100755
--- a/src/configure
+++ b/src/configure
@@ -5127,27 +5127,27 @@ echo $ECHO_N "checking for libffi... $ECHO_C" >&6; }
   if test "$?" = 0 ; then
     libffi_config_cflags=`$libffi_config_prog --cflags-only-other  2> /dev/null`
     if test "$?" = 0 ; then
-      libffi_config_ldflags=`$libffi_config_prog --libs  2> /dev/null`
+      libffi_config_libs=`$libffi_config_prog --libs  2> /dev/null`
       if test "$?" != 0 ; then
         libffi_config_preflags=""
         libffi_config_cflags=""
-        libffi_config_ldflags="-lffi"
+        libffi_config_libs="-lffi"
       fi
     else
       libffi_config_preflags=""
       libffi_config_cflags=""
-      libffi_config_ldflags="-lffi"
+      libffi_config_libs="-lffi"
     fi
   else
     libffi_config_preflags=""
     libffi_config_cflags=""
-    libffi_config_ldflags="-lffi"
+    libffi_config_libs="-lffi"
   fi
 
   OLD_CFLAGS="${CFLAGS}"
-  OLD_LDFLAGS="${LDFLAGS}"
+  OLD_LIBS="${LIBS}"
   CFLAGS="${CFLAGS} ${libffi_config_preflags} ${libffi_config_cflags}"
-  LDFLAGS="${LDFLAGS} ${libffi_config_ldflags}"
+  LIBS="${LIBS} ${libffi_config_libs}"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5196,7 +5196,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 echo "${ECHO_T}$have_libffi" >&6; }
   if test "${have_libffi}" = "no" ; then
     CFLAGS="${OLD_CFLAGS}"
-    LDFLAGS="${OLD_LDFLAGS}"
+    LIBS="${OLD_LIBS}"
     echo "Building own libffi"
   else
     CFLAGS="${OLD_CFLAGS}"
diff --git a/src/racket/configure.ac b/src/racket/configure.ac
index 51d6d4675f..270737f6ce 100644
--- a/src/racket/configure.ac
+++ b/src/racket/configure.ac
@@ -862,27 +862,27 @@ if test "${enable_libffi}" = "yes" ; then
   if test "$?" = 0 ; then
     libffi_config_cflags=`$libffi_config_prog --cflags-only-other  2> /dev/null`
     if test "$?" = 0 ; then
-      libffi_config_ldflags=`$libffi_config_prog --libs  2> /dev/null`
+      libffi_config_libs=`$libffi_config_prog --libs  2> /dev/null`
       if test "$?" != 0 ; then
         libffi_config_preflags=""
         libffi_config_cflags=""
-        libffi_config_ldflags="-lffi"
+        libffi_config_libs="-lffi"
       fi
     else
       libffi_config_preflags=""
       libffi_config_cflags=""
-      libffi_config_ldflags="-lffi"
+      libffi_config_libs="-lffi"
     fi
   else
     libffi_config_preflags=""
     libffi_config_cflags=""
-    libffi_config_ldflags="-lffi"
+    libffi_config_libs="-lffi"
   fi
 
   OLD_CFLAGS="${CFLAGS}"
-  OLD_LDFLAGS="${LDFLAGS}"
+  OLD_LIBS="${LIBS}"
   CFLAGS="${CFLAGS} ${libffi_config_preflags} ${libffi_config_cflags}"
-  LDFLAGS="${LDFLAGS} ${libffi_config_ldflags}"
+  LIBS="${LIBS} ${libffi_config_libs}"
   AC_TRY_LINK([#include <ffi.h>],
               [ffi_cif cif; ]
               [ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 0, &ffi_type_void, NULL);],
@@ -891,7 +891,7 @@ if test "${enable_libffi}" = "yes" ; then
   AC_MSG_RESULT($have_libffi)
   if test "${have_libffi}" = "no" ; then
     CFLAGS="${OLD_CFLAGS}"
-    LDFLAGS="${OLD_LDFLAGS}"
+    LIBS="${OLD_LIBS}"
     echo "Building own libffi"
   else
     CFLAGS="${OLD_CFLAGS}"