Revert previous patch here, we should instead configure in specific
packages for particular uses.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161246 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index aba4645..7d36a06 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1201,7 +1201,7 @@
         no) llvm_cv_oppath=
             AC_SUBST(USE_OPROFILE, [0]) ;;
         *) llvm_cv_oppath="${withval}/lib/oprofile"
-           BUILD_FLAGS="-I${withval}/include";;
+           CPPFLAGS="-I${withval}/include";;
       esac
       case $llvm_cv_os_type in
         Linux)
@@ -1262,7 +1262,7 @@
       AC_SUBST(INTEL_JITEVENTS_LIBDIR)
 
       LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
-      BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
+      CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
 
       AC_SEARCH_LIBS(iJIT_IsProfilingActive, jitprofiling, [], [
         echo "Error! Cannot find libjitprofiling.a. Please check path specified in flag --with-intel-jitevents"
@@ -1280,9 +1280,6 @@
 AC_DEFINE_UNQUOTED([LLVM_USE_INTEL_JITEVENTS],$USE_INTEL_JITEVENTS,
                    [Define if we have the Intel JIT API runtime support library])
 
-dnl Substitute this here for now.
-AC_SUBST(BUILD_FLAGS)
-
 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 6: Check for header files