From 474d48a2110565605f84c7b6c8f0baaa287e4964 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Mon, 5 Mar 2018 04:39:57 +0000
Subject: [PATCH] changed configure.ac to reset DL_LIBS if it's set to 'none
 required'

---
 configure    | 8 +++++++-
 configure.ac | 8 +++++++-
 lib/hcl.c    | 2 +-
 lib/main.c   | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index c5c3160..6372c63 100755
--- a/configure
+++ b/configure
@@ -17671,7 +17671,13 @@ $as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  DL_LIBS="$ac_cv_search_dlopen"
+
+	DL_LIBS="$ac_cv_search_dlopen"
+	if test "x${DL_LIBS}" = "xnone required"
+	then
+		DL_LIBS=""
+	fi
+
 fi
 
 LIBS="$save_LIBS"
diff --git a/configure.ac b/configure.ac
index ed10354..d61275c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,13 @@ AC_CHECK_FUNCS([snprintf _vsnprintf _vsnwprintf])
 AC_CHECK_FUNCS([isatty mmap munmap])
 
 save_LIBS="$LIBS"
-AC_SEARCH_LIBS([dlopen], [dl dld], [DL_LIBS="$ac_cv_search_dlopen"])
+AC_SEARCH_LIBS([dlopen], [dl dld], [
+	DL_LIBS="$ac_cv_search_dlopen"
+	if test "x${DL_LIBS}" = "xnone required"
+	then
+		DL_LIBS=""
+	fi
+])
 LIBS="$save_LIBS"
 AC_SUBST(DL_LIBS)
 
diff --git a/lib/hcl.c b/lib/hcl.c
index 7d163e4..adbd6fe 100644
--- a/lib/hcl.c
+++ b/lib/hcl.c
@@ -90,7 +90,7 @@ static void* alloc_heap (hcl_t* hcl, hcl_oow_t size)
 
 static void free_heap (hcl_t* hcl, void* ptr)
 {
-	return HCL_MMGR_FREE(hcl->mmgr, ptr);
+	HCL_MMGR_FREE(hcl->mmgr, ptr);
 }
 
 int hcl_init (hcl_t* hcl, hcl_mmgr_t* mmgr, hcl_oow_t heapsz, const hcl_vmprim_t* vmprim)
diff --git a/lib/main.c b/lib/main.c
index 98cc35e..2f27ab6 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -450,7 +450,7 @@ static hcl_ooi_t print_handler (hcl_t* hcl, hcl_iocmd_t cmd, void* arg)
 
 static void* alloc_heap (hcl_t* hcl, hcl_oow_t size)
 {
-#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
+#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) && defined(MAP_ANONYMOUS)
 	/* It's called via hcl_makeheap() when HCL creates a GC heap.
 	 * The heap is large in size. I can use a different memory allocation
 	 * function instead of an ordinary malloc.