commit f52114528f19309f349efa1a4171c9051fb02bad
author Patrick Williams <patrick@stwcx.xyz> Wed Nov 09 21:58:38 2016 -0600
committer Patrick Williams <patrick@stwcx.xyz> Wed Nov 09 21:58:44 2016 -0600
tree 3488bc6d0823e3e808b6c31b583563a34a399877
parent 760b72ea3153f3633457196ca4ba1a7e3ef2a7bb

automake: update bootstrap.sh and configure.ac with latest template

Change-Id: I000bc7fabce20e51fe7b31da7a654afc5eba9c9f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 412550f..50b75b7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,13 +1,15 @@
 #!/bin/sh
 
-AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile config.* \
-        configure depcomp install-sh ltmain.sh missing *libtool"
+AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile \
+        config.guess config.h.in config.sub configure depcomp install-sh \
+        ltmain.sh missing *libtool test-driver"
 
 case $1 in
     clean)
         test -f Makefile && make maintainer-clean
-        rm -rf ${AUTOCONF_FILES}
-
+        for file in ${AUTOCONF_FILES}; do
+            find -name "$file" | xargs -r rm -rf
+        done
         exit 0
         ;;
 esac

configure.ac

diff --git a/configure.ac b/configure.ac
index f3f119b..7dd25d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@
 AC_INIT([phosphor-time-manager], [1.0], [https://github.com/openbmc/phosphor-time-manager/issues])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
+AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -20,6 +21,35 @@
 AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd developement package required])])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AX_CXX_COMPILE_STDCXX_14([noext])
+AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CFLAGS])
+AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
 
+# Checks for library functions.
+LT_INIT # Removes 'unrecognized options: --with-libtool-sysroot'
+
+# Check/set gtest specific functions.
+AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
+AC_SUBST(GTEST_CPPFLAGS)
+
+AC_ARG_ENABLE([oe-sdk],
+    AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])
+)
+AC_ARG_VAR(OECORE_TARGET_SYSROOT,
+    [Path to the OE SDK SYSROOT])
+AS_IF([test "x$enable_oe_sdk" == "xyes"],
+    AS_IF([test "x$OECORE_TARGET_SYSROOT" == "x"],
+          AC_MSG_ERROR([OECORE_TARGET_SYSROOT must be set with --enable-oe-sdk])
+    )
+    AC_MSG_NOTICE([Enabling OE-SDK at $OECORE_TARGET_SYSROOT])
+    [
+        testcase_flags="-Wl,-rpath,\${OECORE_TARGET_SYSROOT}/lib"
+        testcase_flags="${testcase_flags} -Wl,-rpath,\${OECORE_TARGET_SYSROOT}/usr/lib"
+        testcase_flags="${testcase_flags} -Wl,-dynamic-linker,`find \${OECORE_TARGET_SYSROOT}/lib/ld-*.so | sort -r -n | head -n1`"
+    ]
+    AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
+)
+
+# Create configured output
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT