More configuration fixes

2 files changed, 31 insertions, 27 deletions

diff --git a/acprep b/acprep
index b4e0b979..ea3583c4 100755
--- a/acprep
+++ b/acprep
@@ -539,6 +539,9 @@ class PrepareBuild(CommandLineApp):
         op.add_option('', '--cpp11', action='store_true',
                       dest='use_cpp11', default=False,
                       help='Use C++11 extensions (requires Clang or gcc 4.6/7/8)')
+        op.add_option('', '--plain', action='store_true',
+                      dest='use_plain', default=False,
+                      help="Don't customize for my private environment")
         op.add_option('', '--output', metavar='DIR', action="callback",
                       callback=self.option_output,
                       help='Build in the specified directory')
@@ -1080,7 +1083,8 @@ class PrepareBuild(CommandLineApp):
         if self.options.no_python:
             self.configure_args.remove('--enable-python')
 
-        if exists('/Users/johnw/Projects/ledger/plan/TODO'):
+        if not self.options.use_plain and \
+           exists('/Users/johnw/Projects/ledger/plan/TODO'):
             self.setup_for_johnw()
         self.setup_system_directories()
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 99eb7df5..418ffd7d 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -528,32 +528,32 @@ AC_CACHE_CHECK(
 AM_CONDITIONAL(HAVE_BOOST_TEST, test x$boost_test_avail_cv_ = xtrue)
 
 # check for C++11 and libc++
-AC_CACHE_CHECK(
-  [if C++11 and libc++ are available],
-  [cpp11_avail_cv_],
-  [cpp11_save_cxxflags=$CXXFLAGS
-   cpp11_save_ldflags=$LDFLAGS
-   CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS"
-   LDFLAGS="-stdlib=libc++ $LDFLAGS"
-   AC_LANG_PUSH(C++)
-   AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM(
-       [[#include <boost/regex.hpp>
-         #include <iostream>]],
-       [[boost::regex foo_regexp("Hello, world!");
-         for (auto i : "Hello, world")
-           std::cout << i << std::endl;]])],
-     [cpp11_avail_cv_=true],
-     [cpp11_avail_cv_=false])
-   AC_LANG_POP
-   CXXFLAGS="$cpp11_save_cxxflags"
-   LDFLAGS="$cpp11_save_ldflags"])
-
-if [test x$cpp11_avail_cv_ = xtrue]; then
-  AC_DEFINE([HAVE_CPP11], [1], [Whether C++11 and libc++ are available])
-  CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS"
-  LDFLAGS="-stdlib=libc++ $LDFLAGS"
-fi
+#AC_CACHE_CHECK(
+#  [if C++11 and libc++ are available],
+#  [cpp11_avail_cv_],
+#  [cpp11_save_cxxflags=$CXXFLAGS
+#   cpp11_save_ldflags=$LDFLAGS
+#   CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS"
+#   LDFLAGS="-stdlib=libc++ $LDFLAGS"
+#   AC_LANG_PUSH(C++)
+#   AC_LINK_IFELSE(
+#     [AC_LANG_PROGRAM(
+#       [[#include <boost/regex.hpp>
+#         #include <iostream>]],
+#       [[boost::regex foo_regexp("Hello, world!");
+#         for (auto i : "Hello, world")
+#           std::cout << i << std::endl;]])],
+#     [cpp11_avail_cv_=true],
+#     [cpp11_avail_cv_=false])
+#   AC_LANG_POP
+#   CXXFLAGS="$cpp11_save_cxxflags"
+#   LDFLAGS="$cpp11_save_ldflags"])
+#
+#if [test x$cpp11_avail_cv_ = xtrue]; then
+#  AC_DEFINE([HAVE_CPP11], [1], [Whether C++11 and libc++ are available])
+#  CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS"
+#  LDFLAGS="-stdlib=libc++ $LDFLAGS"
+#fi
 
 # Checks for header files.
 AC_HEADER_STDC