From 284265651b2876a6d6d95ccbcd757befc86f6e0d Mon Sep 17 00:00:00 2001
From: Benji Wiebe <benjiwiebe14@gmail.com>
Date: Fri, 28 Aug 2015 23:15:13 -0500
Subject: [PATCH 1/2] Added autoconf/automake stuff for compatibility with
 older auto* versions

---
 Makefile.am  | 1 +
 configure.ac | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 2a59fe2..7a88ccb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,6 +127,7 @@ BUILT_SOURCES        = shellinabox/beep.h                                     \
 shellinaboxd_LDADD   = liblogging.la                                          \
                        libhttp.la
 shellinaboxd_LDFLAGS = -static
+docdir               = ${datadir}/doc/${PACKAGE}
 
 symbolname           =                                                        \
   sed -e 's/.*\/\([^.]*\)[.].*/\1/'                                           \
diff --git a/configure.ac b/configure.ac
index 9a7b1ab..f4e815f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}"
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_LANG_WERROR
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL

From 36f512cc6335c59ce967a3f05805e6ca0f3a350e Mon Sep 17 00:00:00 2001
From: Benji Wiebe <benjiwiebe14@gmail.com>
Date: Fri, 28 Aug 2015 23:42:09 -0500
Subject: [PATCH 2/2] Added explanatory comments

---
 Makefile.am  | 1 +
 configure.ac | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 7a88ccb..7b8e7ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,6 +127,7 @@ BUILT_SOURCES        = shellinabox/beep.h                                     \
 shellinaboxd_LDADD   = liblogging.la                                          \
                        libhttp.la
 shellinaboxd_LDFLAGS = -static
+## Added this for compatibility with older versions of autoconf/automake
 docdir               = ${datadir}/doc/${PACKAGE}
 
 symbolname           =                                                        \
diff --git a/configure.ac b/configure.ac
index f4e815f..2a2bdb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ CFLAGS="${CFLAGS:--Os}"
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
+dnl Added this for compatibility with older versions of autoconf/automake
 AM_PROG_CC_C_O
 AC_LANG_WERROR
 AC_PROG_INSTALL