Regenerate configure.

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@85023 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 69 insertions, 1 deletions

diff --git a/configure b/configure
index 9ca86611..6207a85e 100755
--- a/configure
+++ b/configure
@@ -651,6 +651,9 @@ target
 target_cpu
 target_vendor
 target_os
+LLVM_VERSION_MAJOR
+LLVM_VERSION_MINOR
+LLVM_IS_RELEASE
 KLEE_UCLIBC
 ENABLE_UCLIBC
 ENABLE_POSIX_RUNTIME
@@ -2014,6 +2017,59 @@ LLVM_SRC=$llvm_src
 LLVM_OBJ=$llvm_obj
 
 
+{ echo "$as_me:$LINENO: checking llvm package version" >&5
+echo $ECHO_N "checking llvm package version... $ECHO_C" >&6; }
+llvm_package_version=`grep PACKAGE_VERSION= $with_llvmsrc/configure | cut -d\' -f 2`
+{ echo "$as_me:$LINENO: result: $llvm_package_version" >&5
+echo "${ECHO_T}$llvm_package_version" >&6; }
+
+llvm_version_split=`python -c "import re; print '\t'.join(map(str, re.match('([0-9]+).([0-9]+)(svn)?', \"$llvm_package_version\").groups()))"`
+
+{ echo "$as_me:$LINENO: checking llvm version major" >&5
+echo $ECHO_N "checking llvm version major... $ECHO_C" >&6; }
+llvm_version_major=`echo "$llvm_version_split" | cut -f 1`
+{ echo "$as_me:$LINENO: result: $llvm_version_major" >&5
+echo "${ECHO_T}$llvm_version_major" >&6; }
+
+{ echo "$as_me:$LINENO: checking llvm version minor" >&5
+echo $ECHO_N "checking llvm version minor... $ECHO_C" >&6; }
+llvm_version_minor=`echo "$llvm_version_split" | cut -f 2`
+{ echo "$as_me:$LINENO: result: $llvm_version_minor" >&5
+echo "${ECHO_T}$llvm_version_minor" >&6; }
+
+{ echo "$as_me:$LINENO: checking llvm is release version" >&5
+echo $ECHO_N "checking llvm is release version... $ECHO_C" >&6; }
+llvm_version_svn=`echo "$llvm_version_split" | cut -f 3`
+if test "$llvm_version_svn" == "svn"; then
+  llvm_is_release=0
+else
+  llvm_is_release=1
+fi
+{ echo "$as_me:$LINENO: result: $llvm_is_release" >&5
+echo "${ECHO_T}$llvm_is_release" >&6; }
+
+
+cat >>confdefs.h <<_ACEOF
+#define LLVM_VERSION_MAJOR $llvm_version_major
+_ACEOF
+
+LLVM_VERSION_MAJOR=$llvm_version_major
+
+
+cat >>confdefs.h <<_ACEOF
+#define LLVM_VERSION_MINOR $llvm_version_minor
+_ACEOF
+
+LLVM_VERSION_MINOR=$llvm_version_minor
+
+
+cat >>confdefs.h <<_ACEOF
+#define LLVM_IS_RELEASE $llvm_is_release
+_ACEOF
+
+LLVM_IS_RELEASE=$llvm_is_release
+
+
 
 
 # Check whether --with-uclibc was given.
@@ -5586,6 +5642,9 @@ target!$target$ac_delim
 target_cpu!$target_cpu$ac_delim
 target_vendor!$target_vendor$ac_delim
 target_os!$target_os$ac_delim
+LLVM_VERSION_MAJOR!$LLVM_VERSION_MAJOR$ac_delim
+LLVM_VERSION_MINOR!$LLVM_VERSION_MINOR$ac_delim
+LLVM_IS_RELEASE!$LLVM_IS_RELEASE$ac_delim
 KLEE_UCLIBC!$KLEE_UCLIBC$ac_delim
 ENABLE_UCLIBC!$ENABLE_UCLIBC$ac_delim
 ENABLE_POSIX_RUNTIME!$ENABLE_POSIX_RUNTIME$ac_delim
@@ -5611,7 +5670,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/include/klee/Config/config.h.in b/include/klee/Config/config.h.in
index ef41d786..6d690d24 100644
--- a/include/klee/Config/config.h.in
+++ b/include/klee/Config/config.h.in
@@ -42,6 +42,15 @@
 /* Path to KLEE's uClibc */
 #undef KLEE_UCLIBC
 
+/* LLVM version is release (instead of development) */
+#undef LLVM_IS_RELEASE
+
+/* LLVM major version number */
+#undef LLVM_VERSION_MAJOR
+
+/* LLVM minor version number */
+#undef LLVM_VERSION_MINOR
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT