diff --git a/configure b/configure
index b2bbb6b..d2890aa 100755
--- a/configure
+++ b/configure
@@ -21063,7 +21063,10 @@ else
 
 fi
 
-test "${enable_shared}" = "no" && enable_dynamic_module_is="no"
+if test "${enable_shared}" = "no"
+then
+	enable_dynamic_module_is="no"
+fi
 
 if test "${enable_dynamic_module_is}" = "yes"
 then
@@ -21088,7 +21091,11 @@ else
 
 fi
 
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
+
+if test "${enable_shared}" = "no" -a "${enable_static}" = "yes"
+then
+	enable_static_module_is="yes"
+fi
 
 if test "${enable_static_module_is}" = "yes"
 then
diff --git a/configure.ac b/configure.ac
index 407d90d..607a708 100644
--- a/configure.ac
+++ b/configure.ac
@@ -597,7 +597,10 @@ AC_ARG_ENABLE([dynamic-module],
 	enable_dynamic_module_is=$enableval,
 	enable_dynamic_module_is=yes
 )
-test "${enable_shared}" = "no" && enable_dynamic_module_is="no"
+if test "${enable_shared}" = "no"
+then
+	enable_dynamic_module_is="no"
+fi
 
 if test "${enable_dynamic_module_is}" = "yes"
 then
@@ -611,7 +614,11 @@ AC_ARG_ENABLE([static-module],
 	enable_static_module_is=$enableval,
 	enable_static_module_is=no
 )
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
+
+if test "${enable_shared}" = "no" -a "${enable_static}" = "yes"
+then
+	enable_static_module_is="yes"
+fi
 
 if test "${enable_static_module_is}" = "yes"
 then
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e30dda1..299b454 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,18 +33,22 @@ pkgincludedir = $(includedir)
 pkglibdir = $(libdir)
 
 pkginclude_HEADERS = \
-	hcl-cfg.h \
+	hcl.h \
 	hcl-cmn.h \
+	hcl-opt.h \
 	hcl-rbt.h \
 	hcl-tmr.h \
-	hcl-utl.h \
-	hcl.h
+	hcl-utl.h
 
 pkglib_LTLIBRARIES = libhcl.la
 libhcl_la_SOURCES = \
+	hcl.h \
+	hcl-cmn.h \
+	hcl-opt.h \
+	hcl-rbt.h \
+	hcl-tmr.h \
+	hcl-utl.h \
 	hcl-prv.h \
-	logfmtv.h \
-	sa-utl.h \
 	bigint.c \
 	comp.c \
 	debug.c \
@@ -55,6 +59,7 @@ libhcl_la_SOURCES = \
 	gc.c \
 	hcl.c \
 	heap.c \
+	logfmtv.h \
 	logfmt.c \
 	number.c \
 	obj.c \
@@ -67,6 +72,7 @@ libhcl_la_SOURCES = \
 	sym.c \
 	tmr.c \
 	utf8.c \
+	sa-utl.h \
 	utl.c 
 libhcl_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 libhcl_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@@ -106,7 +112,7 @@ bin_PROGRAMS = hcl
 hcl_SOURCES = main.c 
 hcl_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 hcl_LDFLAGS = $(LDFLAGS_LIB_COMMON)
-hcl_LDADD = $(LIBADD_LIB_COMMON) -lhcl #-ldyncall_s
+hcl_LDADD = $(LIBADD_LIB_COMMON) -lhcl
 if ENABLE_STATIC_MODULE
 hcl_DEPENDENCIES = libhcl.la
 endif
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6eabaa1..a387ebf 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -253,8 +253,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__pkginclude_HEADERS_DIST = hcl-cfg.h hcl-cmn.h hcl-rbt.h hcl-tmr.h \
-	hcl-utl.h hcl.h hcl-s.h hcl-c.h
+am__pkginclude_HEADERS_DIST = hcl.h hcl-cmn.h hcl-opt.h hcl-rbt.h \
+	hcl-tmr.h hcl-utl.h hcl-s.h hcl-c.h
 HEADERS = $(pkginclude_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)hcl-cfg.h.in
@@ -448,13 +448,17 @@ CPPFLAGS_ALL_COMMON = \
 CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON)
 LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
 LIBADD_LIB_COMMON = $(LIBM) $(am__append_1) $(am__append_2)
-pkginclude_HEADERS = hcl-cfg.h hcl-cmn.h hcl-rbt.h hcl-tmr.h hcl-utl.h \
-	hcl.h $(am__append_4) $(am__append_6)
+pkginclude_HEADERS = hcl.h hcl-cmn.h hcl-opt.h hcl-rbt.h hcl-tmr.h \
+	hcl-utl.h $(am__append_4) $(am__append_6)
 pkglib_LTLIBRARIES = libhcl.la $(am__append_3) $(am__append_5)
 libhcl_la_SOURCES = \
+	hcl.h \
+	hcl-cmn.h \
+	hcl-opt.h \
+	hcl-rbt.h \
+	hcl-tmr.h \
+	hcl-utl.h \
 	hcl-prv.h \
-	logfmtv.h \
-	sa-utl.h \
 	bigint.c \
 	comp.c \
 	debug.c \
@@ -465,6 +469,7 @@ libhcl_la_SOURCES = \
 	gc.c \
 	hcl.c \
 	heap.c \
+	logfmtv.h \
 	logfmt.c \
 	number.c \
 	obj.c \
@@ -477,6 +482,7 @@ libhcl_la_SOURCES = \
 	sym.c \
 	tmr.c \
 	utf8.c \
+	sa-utl.h \
 	utl.c 
 
 libhcl_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
@@ -496,7 +502,7 @@ libhcl_la_DEPENDENCIES = $(am__append_8)
 hcl_SOURCES = main.c 
 hcl_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 hcl_LDFLAGS = $(LDFLAGS_LIB_COMMON)
-hcl_LDADD = $(LIBADD_LIB_COMMON) -lhcl #-ldyncall_s
+hcl_LDADD = $(LIBADD_LIB_COMMON) -lhcl
 @ENABLE_STATIC_MODULE_TRUE@hcl_DEPENDENCIES = libhcl.la
 @ENABLE_HCLS_TRUE@hcls_SOURCES = main-s.c
 @ENABLE_HCLS_TRUE@hcls_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)