diff --git a/compiler/cpp/bootstrap.sh b/compiler/cpp/bootstrap.sh
index 67b6eea..de6f055 100755
--- a/compiler/cpp/bootstrap.sh
+++ b/compiler/cpp/bootstrap.sh
@@ -3,7 +3,11 @@
 ./cleanup.sh
 autoscan
 aclocal -I ../../lib/cpp/aclocal
-libtoolize --automake
+if libtoolize --version 1 >/dev/null 2>/dev/null; then
+  libtoolize --automake
+elif glibtoolize --version 1 >/dev/null 2>/dev/null; then
+  glibtoolize --automake
+fi
 touch NEWS README AUTHORS ChangeLog
 autoconf
 automake -ac
diff --git a/compiler/cpp/configure.ac b/compiler/cpp/configure.ac
index ba08e2f..83b6bb0 100644
--- a/compiler/cpp/configure.ac
+++ b/compiler/cpp/configure.ac
@@ -22,6 +22,10 @@
 
 AC_CHECK_FUNCS([strerror])
 
+AC_STRUCT_TM
+
+AC_FUNC_STRFTIME
+
 AC_FUNC_MALLOC
 
 AC_FUNC_REALLOC