# HG changeset patch
# User Carlo de Falco <cdf@users.sourceforge.net>
# Date 1342922282 -7200
# Node ID 894cf2c07f92df15e7484c06d9e75eeef3d89a43
# Parent  0ef151f9fdc90afafc9904a09da1e8674cb0e6a7
Properly restore compiler and linker flags after llvm tests

* configure.ac: move save and restore of CPPFLAGS, CXXFLAGS, LIBS and LDFLAGS

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -721,6 +721,11 @@
 dnl llvm is odd and has its own pkg-config like script. We should probably check
 dnl for existance and 
 dnl
+save_CPPFLAGS="$CPPFLAGS"
+save_CXXFLAGS="$CXXFLAGS"
+save_LIBS="$LIBS"
+save_LDFLAGS="$LDFLAGS"
+
 warn_llvm="LLVM library fails tests. JIT compilation will be disabled."
 
 AC_ARG_VAR(LLVM_CONFIG, [path to llvm-config utility])
@@ -750,11 +755,6 @@
   LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
   LLVM_CXXFLAGS=
 
-  save_CPPFLAGS="$CPPFLAGS"
-  save_CXXFLAGS="$CXXFLAGS"
-  save_LIBS="$LIBS"
-  save_LDFLAGS="$LDFLAGS"
-
   dnl
   dnl We define some extra flags that llvm requires in order to include headers.
   dnl Idealy we should get these from llvm-config, but llvm-config isn't very
@@ -780,15 +780,11 @@
       ])
     ])
   AC_LANG_POP(C++)
+  
 else
   warn_llvm="LLVM_CONFIG not set. JIT compilation will be disabled."
 fi
 
-CPPFLAGS="$save_CPPFLAGS"
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$save_LIBS"
-LDFLAGS="$save_LDFLAGS"
-
 if test -z "$warn_llvm"; then
   AC_DEFINE(HAVE_LLVM, 1, [Define if LLVM is available])
 else
@@ -804,6 +800,11 @@
 AC_SUBST(LLVM_LDFLAGS)
 AC_SUBST(LLVM_LIBS)
 
+CPPFLAGS="$save_CPPFLAGS"
+CXXFLAGS="$save_CXXFLAGS"
+LIBS="$save_LIBS"
+LDFLAGS="$save_LDFLAGS"
+
 ### Check for HDF5 library.
 
 save_CPPFLAGS="$CPPFLAGS"