3 files changed, 48 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 46fbc93..fe6c47c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Copyright (C) 2014 Bindle Binaries <syzdek@bindlebinaries.com>.
 0.6
    - Adding explicity flush to lo interface in rc.inet1_local. (syzdek)
    - Updating version of bindletools used by autotools. (syzdek)
+   - Updating configure and autogen scripts. (syzdek)
 
 0.5
    - Updating logic in bash profile for determining hostname. (syzdek)
diff --git a/autogen.sh b/autogen.sh
index 444031c..6eec939 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,7 +37,6 @@
 
 AUTOGENNAME="`basename ${0}`" || exit $?
 SRCDIR=`dirname ${0}`
-cd $SRCDIR || exit 1
 
 
 # check for required programs
@@ -51,22 +50,45 @@ done
 
 
 # updates git repository
-if test -d .git || test -f .git;then
-   git submodule init           2>&1 | sed -e 's/^/git submodule init: /g' || exit 1
-   git submodule sync           2>&1 | sed -e 's/^/git submodule sync: /g' || exit 1
-   git submodule update --merge 2>&1 | sed -e 's/^/git submodule update: /g' || exit 1
+if test -d ${SRCDIR}/.git || test -f ${SRCDIR}/.git;then
+   cd ${SRCDIR}
+   git submodule init                              || exit 1
+   git submodule sync                              || exit 1
+   git submodule update --init --recursive --merge || exit 1
+   cd -
 fi
 
 
+# generates files for bindletools
+#${SRCDIR}/contrib/bindletools/autogen.sh || exit 1
+#echo "running ${0} ..."
+
+
+# symlinks M4 macros
+cd ${SRCDIR}/m4
+rm -f ./bindle*.m4 || exit 1
+ln -s ../contrib/bindletools/m4/bindle*.m4 ./
+cd -
+
+
 # Performs some useful checks
-autoscan . || exit 1
+autoscan ${SRCDIR} || exit 1
 
 
 # generates/installs autotools files
 autoreconf -v -i -f -Wall \
    -I m4 \
-   -I contrib/bindletools/m4 \
+   -m \
+   ${SRCDIR} \
    || exit 1
 
 
+# makes build directory
+mkdir -p ${SRCDIR}/build
+
+
+# add newline to create visual separation
+echo " "
+
+
 # end of script
diff --git a/configure.ac b/configure.ac
index b21fcf8..766231a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,20 +38,11 @@ AC_PREREQ([2.65])
 
 AC_COPYRIGHT([Copyright (c) 2015 Bindle Binaries <syzdek@bindlebinaries.com>.])
 AC_REVISION(0.1)
-AC_INIT([Bindle Binaries Admin Tools],[0.5],[syzdek@bindlebinaries.com],[bindleadmin])
+AC_INIT([Bindle Binaries Admin Tools],[0.6],[syzdek@bindlebinaries.com],[bindleadmin])
 
-AC_SUBST([RELEASE_MONTH],["March 20115])
-
-# Version Info:
-#    Current    -- the current version number of this API
-#    Revision   -- the revision of the implementation of the API version
-#    Age        -- How many seqential past API versions is supported by
-#                  this implementation
-# Format => Current:Revision:Age
-# Convenience macro:
-#    AC_BINDLE_LIBTOOL_VERSION_INFO(current, revision, age)
-AC_BINDLE_LIBTOOL_VERSION_INFO(0, 0, 0)
+AC_SUBST([RELEASE_MONTH],["March 2015"])
 
+# directory locations
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([build-aux/git-tar-name.txt])
 #AC_CONFIG_LIBOBJ_DIR(compat)
@@ -72,11 +63,21 @@ AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_USE_SYSTEM_EXTENSIONS # replaces AC_AIX AC_GNU_SOURCE AC_MINIX
 AC_C_BIGENDIAN
 
+# Version Info:
+#    Current    -- the current version number of this API
+#    Revision   -- the revision of the implementation of the API version
+#    Age        -- How many seqential past API versions is supported by
+#                  this implementation
+# Format => Current:Revision:Age
+# Convenience macro:
+#    AC_BINDLE_LIBTOOL_VERSION_INFO(current, revision, age)
+AC_BINDLE_LIBTOOL_VERSION_INFO(0, 0, 0)
+
 # binary locations
-AC_PROG_INSTALL
 AC_PATH_PROG([SHELL],   sh bash,        [AC_MSG_ERROR([missing "sh"])], [$PATH])
 AC_CHECK_TOOLS(AR,      ar gar,         [AC_MSG_ERROR([missing binutil "ar"])])
 AC_CHECK_TOOLS(LD,      ld gld,         [AC_MSG_ERROR([missing binutil "ld"])])
@@ -97,6 +98,10 @@ LT_INIT(dlopen disable-fast-install win32-dll)
 # initiates bindle tools macros
 AC_BINDLE(contrib/bindletools)
 
+# determine PACKAGE_VERSION via Git
+AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version.sh])
+
+
 # custom configure options
 AC_BINDLE_ENABLE_WARNINGS
 AC_BINDLE_WITH_PERL
@@ -105,9 +110,6 @@ AC_BINDLEADMIN_SLACKWARE
 # enables getopt_long if header and functions were found
 AC_CHECK_HEADERS([getopt.h], [AC_DEFINE_UNQUOTED(USE_GETOPT_LONG, 1, [Use GNU getopt_long])])
 
-# determine PACKAGE_VERSION via Git
-AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version.sh])
-
 # Creates outputs
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT