2 files changed, 36 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 1d45fd2..123e316 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,8 @@
 SUBDIRS                                 =
 DIST_SUBDIRS                            =
 
+# GNU make options
+V                                       = 0
 
 # Global flags
 AM_LIBS                                 =
@@ -53,14 +55,25 @@ AM_CPPFLAGS				= -O2 \
 ACLOCAL_AMFLAGS                         = -I m4 -W all -W error
 DEFS                                    = -DLOCALEDIR="\"$(localedir)\"" @DEFS@
 
+# custom directories
 
 # automake targets
+check_PROGRAMS                          =
 bin_PROGRAMS                            =
+bin_SCRIPTS                             =
 include_HEADERS                         =
 lib_LTLIBRARIES                         =
+lib_LIBRARIES                           =
+sbin_SCRIPTS                            =
+sbin_PROGRAMS                           =
+noinst_PROGRAMS                         =
+noinst_HEADERS                          = src/common.h \
+                                          include/bindle_prefix.h
+noinst_LTLIBRARIES                      =
+noinst_LIBRARIES                        = lib/libbindle.a
 noinst_PROGRAMS                         =
-noinst_HEADERS                          = src/common.h
 man_MANS                                =
+EXTRA_PROGRAMS                          =
 EXTRA                                   = src/bindump \
                                           src/bitcopy \
                                           src/bitops \
@@ -78,8 +91,8 @@ EXTRA					= src/bindump \
 
 # lists
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT      =
-BUILT_SOURCES                           =
-TESTS                                   =
+BUILT_SOURCES                           = include/bindle_prefix.h
+TESTS                                   = $(LIBBINDLE_TESTS)
 XFAIL_TESTS                             =
 EXTRA_MANS                              =
 EXTRA_DIST                              = autogen.sh \
@@ -103,13 +116,13 @@ EXTRA_DIST				= autogen.sh \
                                           $(srcdir)/examples/example.txt \
                                           $(srcdir)/build-aux/Makefile-xcode \
                                           $(srcdir)/dmstools.xcodeproj/project.pbxproj
-CLEANFILES                              = \
-                                          $(builddir)/a.out   $(srcdir)/a.out \
+CLEANFILES                              = $(builddir)/a.out   $(srcdir)/a.out \
                                           $(builddir)/*/a.out $(srcdir)/*/a.out \
                                           autoscan.log        $(srcdir)/autoscan.log \
                                           config.h.in~        $(srcdir)/config.h.in~ \
                                           configure.scan      $(srcdir)/configure.scan \
                                           $(man_MANS) \
+                                          include/bindle_prefix.h \
                                           @PACKAGE_TARNAME@-*.tar.* \
                                           @PACKAGE_TARNAME@-*.zip
 DISTCHECK_CONFIGURE_FLAGS               = --enable-strictwarnings \
@@ -232,12 +245,12 @@ endif
 
 # Makefile includes
 GIT_PACKAGE_VERSION_DIR=include
-SUBST_EXPRESSIONS =  \
-        -e 's,[@]RELEASE_MONTH[@],@RELEASE_MONTH@,g'
-include $(srcdir)/contrib/bindletools/build-aux/makefile-bindle.am
-include $(srcdir)/contrib/bindletools/build-aux/makefile-autotools.am
-include $(srcdir)/contrib/bindletools/build-aux/makefile-subst.am
-include $(srcdir)/contrib/bindletools/build-aux/makefile-version.am
+SUBST_EXPRESSIONS = -e 's,[@]RELEASE_MONTH[@],@RELEASE_MONTH@,g'
+include contrib/bindletools/build-aux/makefile-subst.am
+include contrib/bindletools/build-aux/makefile-version.am
+include contrib/bindletools/build-aux/makefile-libbindle.am
+include contrib/bindletools/build-aux/makefile-bindle.am
+include contrib/bindletools/build-aux/makefile-autotools.am
 
 
 # custom targets
diff --git a/configure.ac b/configure.ac
index 6772979..8c53980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #
 #   DMS Tools and Utilities
-#   Copyright (C) 2008, 2009, 2010, 2021 David M. Syzdek <david@syzdek.net>
+#   Copyright (C) 2008, 2009, 2010, 2021, 2022 David M. Syzdek <david@syzdek.net>
 #
 #   @SYZDEK_LICENSE_HEADER_START@
 #
@@ -36,16 +36,15 @@
 
 AC_PREREQ(2.65)
 
-AC_COPYRIGHT([Copyright (c) 2008, 2009, 2010, 2011, 2013, 2021 David M. Syzdek <david@syzdek.net>.])
+AC_COPYRIGHT([Copyright (c) 2008, 2009, 2010, 2011, 2013, 2021, 2022 David M. Syzdek <david@syzdek.net>.])
 AC_REVISION(0.2)
 AC_INIT([DMS Tools and Utilities],[1.6],[david@syzdek.net],[dmstools])
 
 AC_SUBST([RELEASE_MONTH],     ["October 2021"])
-AC_SUBST([PACKAGE_COPYRIGHT], ["Copyright (C) 2008, 2009, 2010, 2011, 2013, 2021 David M. Syzdek."])
+AC_SUBST([PACKAGE_COPYRIGHT], ["Copyright (C) 2008, 2009, 2010, 2011, 2013, 2021, 2022 David M. Syzdek."])
 AC_DEFINE_UNQUOTED(PACKAGE_COPYRIGHT, ["$PACKAGE_COPYRIGHT"], ["Copyright info"])
 
-
-# autoconf options
+# directory locations
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([build-aux/git-tar-name.txt])
 #AC_CONFIG_LIBOBJ_DIR(compat)
@@ -69,6 +68,8 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_USE_SYSTEM_EXTENSIONS # replaces AC_AIX AC_GNU_SOURCE AC_MINIX
 AC_C_BIGENDIAN
+AC_C_INLINE
+AC_C_RESTRICT
 
 # Version Info:
 #    Current    -- the current version number of this API
@@ -155,7 +156,9 @@ AC_CHECK_HEADERS([wchar.h],      [], [AC_MSG_ERROR([missing required headers])])
 AC_CHECK_HEADERS([wctype.h],     [], [AC_MSG_ERROR([missing required headers])])
 
 # check types
-AC_CHECK_TYPES([ptrdiff_t],      [], [AC_MSG_ERROR([missing required data type])])
+AC_CHECK_TYPES([ptrdiff_t],         [], [AC_MSG_ERROR([missing required data type])])
+AC_CHECK_TYPES([atomic_intmax_t],   [], [AC_MSG_ERROR([missing required data type])], [#include <stdatomic.h>])
+AC_CHECK_TYPES([atomic_uintmax_t],  [], [AC_MSG_ERROR([missing required data type])], [#include <stdatomic.h>])
 
 # Symbol checks
 AC_CHECK_DECLS([environ])
@@ -164,14 +167,10 @@ AC_CHECK_LIB([dl],   [dlclose],     [], [AC_MSG_ERROR([missing required library
 AC_CHECK_LIB([dl],   [dlerror],     [], [AC_MSG_ERROR([missing required library -ldl])])
 AC_CHECK_LIB([dl],   [dlopen],      [], [AC_MSG_ERROR([missing required library -ldl])])
 AC_CHECK_LIB([dl],   [dlsym],       [], [AC_MSG_ERROR([missing required library -ldl])])
-
-
-AC_CHECK_LIB([users],[noobs],,[AC_MSG_NOTICE([No noobs found, disabling hand_holding().])])
-
+AC_CHECK_LIB([users],[noobs],       [], [AC_MSG_NOTICE([No noobs found, disabling hand_holding().])])
 
 # GNU Libtool Support
-LT_INIT(dlopen disable-fast-install win32-dll)
-
+LT_INIT(dlopen disable-fast-install)
 
 # initiates bindle tools macros
 AC_BINDLE(contrib/bindletools)
@@ -181,6 +180,7 @@ AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version
 
 # custom configure options
 AC_BINDLE_ENABLE_WARNINGS([-Wno-unknown-pragmas], [])
+AC_BINDLE_LIBBINDLE([dmstools_])
 AC_BINDLE_WITH_PERL
 AC_DMS_REGEX
 AC_DMS_TOOL_ALL