From bc9632fe44be231066b67db5053b42a7a3b70a94 Mon Sep 17 00:00:00 2001
From: MichaelJFox <mfox@cavium.com>
Date: Mon, 16 Jan 2017 16:04:17 -0800
Subject: [PATCH] Add --with-libgc-prefix=path and friends

Copied the code in configure.ac for --with-libffi-prefix
No idea how it works, but I tested it and it does apparently work.
---
 src/configure    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/configure.ac | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/src/configure b/src/configure
index 54c3af9ff..5e958b43a 100755
--- a/src/configure
+++ b/src/configure
@@ -776,6 +776,9 @@ with_gmp_libdir
 with_libffi_prefix
 with_libffi_incdir
 with_libffi_libdir
+with_libgc_prefix
+with_libgc_incdir
+with_libgc_libdir
 with___thread
 enable_opcode8
 with_cxx
@@ -1491,6 +1494,12 @@ Optional Packages:
                           path to system LIBFFI includes (overrides prefix)
   --with-libffi-libdir=path
                           path to system LIBFFI libraries (overrides prefix)
+  --with-libgc-prefix=path
+                          prefix for system LIBGC includes and libraries
+  --with-libgc-incdir=path
+                          path to system LIBGC includes (overrides prefix)
+  --with-libgc-libdir=path
+                          path to system LIBGC libraries (overrides prefix)
   --with-__thread         Enable __thread thread-local variables (yes|NO|auto)
                           (supported by NPTL-aware glibc and maybe Windows)
   --with-cxx              build ECL using C++ compiler (default=NO)
@@ -2734,6 +2743,27 @@ fi
 
 
 
+# Check whether --with-libgc-prefix was given.
+if test "${with_libgc_prefix+set}" = set; then :
+  withval=$with_libgc_prefix; LIBGC_INCDIR="$withval/include"; LIBGC_LIBDIR="$withval/lib"
+fi
+
+
+
+# Check whether --with-libgc-incdir was given.
+if test "${with_libgc_incdir+set}" = set; then :
+  withval=$with_libgc_incdir; LIBGC_INCDIR="$withval"
+fi
+
+
+
+# Check whether --with-libgc-libdir was given.
+if test "${with_libgc_libdir+set}" = set; then :
+  withval=$with_libgc_libdir; LIBGC_LIBDIR="$withval"
+fi
+
+
+
 # Check whether --with-__thread was given.
 if test "${with___thread+set}" = set; then :
   withval=$with___thread;
@@ -5727,6 +5757,20 @@ fi
 CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
 LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
 
+if test "x$LIBGC_INCDIR" != "x"; then
+  LIBGC_CPPFLAGS="-I$LIBGC_INCDIR"
+fi
+if test "x$LIBGC_LIBDIR" != "x"; then
+  LIBGC_LDFLAGS="-L$LIBGC_LIBDIR"
+  if test "$enable_rpath" = "yes"; then
+    if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
+      LIBGC_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBGC_LIBDIR,"`" $LIBGC_LDFLAGS"
+    fi
+  fi
+fi
+CPPFLAGS="$CPPFLAGS $LIBGC_CPPFLAGS"
+LDFLAGS="$LDFLAGS $LIBGC_LDFLAGS"
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwnam in -lsun" >&5
 $as_echo_n "checking for getpwnam in -lsun... " >&6; }
diff --git a/src/configure.ac b/src/configure.ac
index 6a407bba0..445eeeb29 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -120,6 +120,22 @@ AC_ARG_WITH(libffi-libdir,
 		  [path to system LIBFFI libraries (overrides prefix)] ),
   [LIBFFI_LIBDIR="$withval"], [])
 
+dnl LIBGC library options
+AC_ARG_WITH(libgc-prefix,
+  AS_HELP_STRING( [--with-libgc-prefix=path],
+                  [prefix for system LIBGC includes and libraries] ),
+  [LIBGC_INCDIR="$withval/include"; LIBGC_LIBDIR="$withval/lib"], [])
+
+AC_ARG_WITH(libgc-incdir,
+  AS_HELP_STRING( [--with-libgc-incdir=path],
+		  [path to system LIBGC includes (overrides prefix)] ),
+  [LIBGC_INCDIR="$withval"], [])
+
+AC_ARG_WITH(libgc-libdir,
+  AS_HELP_STRING( [--with-libgc-libdir=path],
+		  [path to system LIBGC libraries (overrides prefix)] ),
+  [LIBGC_LIBDIR="$withval"], [])
+
 dnl
 AC_ARG_WITH(__thread,
   AS_HELP_STRING( [--with-__thread],
@@ -488,6 +504,22 @@ fi
 CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
 LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
 
+dnl ======================================================================
+dnl LIBGC library
+if test "x$LIBGC_INCDIR" != "x"; then
+  LIBGC_CPPFLAGS="-I$LIBGC_INCDIR"
+fi
+if test "x$LIBGC_LIBDIR" != "x"; then
+  LIBGC_LDFLAGS="-L$LIBGC_LIBDIR"
+  if test "$enable_rpath" = "yes"; then
+    if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
+      LIBGC_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBGC_LIBDIR,"`" $LIBGC_LDFLAGS"
+    fi
+  fi
+fi
+CPPFLAGS="$CPPFLAGS $LIBGC_CPPFLAGS"
+LDFLAGS="$LDFLAGS $LIBGC_LDFLAGS"
+
 dnl =====================================================================
 dnl Checks for libraries