diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/main/interactive_shell.cpp | 6 | ||||
| -rwxr-xr-x | src/options/mkoptions | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 629e1625b..31dec369b 100644 --- a/configure.ac +++ b/configure.ac @@ -982,7 +982,7 @@ AC_LIB_ANTLR CVC4_CHECK_BINDINGS([c java])dnl csharp perl php python ruby tcl ocaml]) # Checks for header files and their contents. -AC_CHECK_HEADERS([getopt.h unistd.h]) +AC_CHECK_HEADERS([getopt.h unistd.h ext/stdio_filebuf.h]) # Checks for typedefs, structures, and compiler characteristics. #AC_HEADER_STDBOOL diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index a19e23725..7d3742cf4 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -43,7 +43,9 @@ #if HAVE_LIBREADLINE # include <readline/readline.h> # include <readline/history.h> -# include <ext/stdio_filebuf.h> +# if HAVE_EXT_STDIO_FILEBUF_H +# include <ext/stdio_filebuf.h> +# endif /* HAVE_EXT_STDIO_FILEBUF_H */ #endif /* HAVE_LIBREADLINE */ using namespace std; @@ -57,7 +59,9 @@ const string InteractiveShell::INPUT_FILENAME = "<shell>"; #if HAVE_LIBREADLINE +#if HAVE_EXT_STDIO_FILEBUF_H using __gnu_cxx::stdio_filebuf; +#endif /* HAVE_EXT_STDIO_FILEBUF_H */ char** commandCompletion(const char* text, int start, int end); char* commandGenerator(const char* text, int state); diff --git a/src/options/mkoptions b/src/options/mkoptions index 087af0ef6..32f81455b 100755 --- a/src/options/mkoptions +++ b/src/options/mkoptions @@ -2,7 +2,7 @@ # # mkoptions # Morgan Deters <mdeters@cs.nyu.edu> for CVC4 -# Copyright (c) 2011-2013 The CVC4 Project +# Copyright (c) 2011-2014 The CVC4 Project # # The purpose of this script is to create options.{h,cpp} # from template files and a list of options. @@ -1478,7 +1478,7 @@ EOF fi } -total=$(($#/2+21*${#templates[@]})) +total=$(($#/2+23*${#templates[@]})) count=0 while [ $# -gt 0 ]; do kf="$1"; shift |