From 9d9b55603b6dc481b3551143a61eda3db59d9090 Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Thu, 16 Jun 2011 13:32:06 +0200
Subject: [PATCH] we always have liblpp now, remove WITH_ILP flag

---
 ir/be/becopyilp.c   | 10 ----------
 ir/be/becopyilp2.c  | 10 ----------
 ir/be/becopyilp_t.h |  7 ++-----
 ir/lpp/lpp_cplex.c  |  5 +++++
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 57fdab4ee..87646de36 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -37,8 +37,6 @@
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
-#ifdef WITH_ILP
-
 #define DUMP_ILP 1
 #define DUMP_SOL 2
 
@@ -265,11 +263,3 @@ void free_ilp_env(ilp_env_t *ienv)
 	free_lpp(ienv->lp);
 	free(ienv);
 }
-
-#else /* WITH_ILP */
-
-static inline void only_that_you_can_compile_without_WITH_ILP_defined(void)
-{
-}
-
-#endif /* WITH_ILP */
diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 36dad1095..61cf23b28 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -46,8 +46,6 @@
  */
 #include "config.h"
 
-#ifdef WITH_ILP
-
 #include "bitset.h"
 #include "raw_bitset.h"
 #include "pdeq.h"
@@ -590,11 +588,3 @@ int co_solve_ilp2(copy_opt_t *co)
 
 	return sol_state == lpp_optimal;
 }
-
-#else /* WITH_ILP */
-
-static inline void only_that_you_can_compile_without_WITH_ILP_defined(void)
-{
-}
-
-#endif /* WITH_ILP */
diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index a73d07e93..5f31c12d3 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -115,9 +115,8 @@ static inline int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
  *****************************************************************************/
 
-#ifdef WITH_ILP
-#include <lpp/lpp.h>
-#include <lpp/lpp_net.h>
+#include "lpp.h"
+#include "lpp_net.h"
 
 #define EPSILON 0.00001
 
@@ -148,5 +147,3 @@ void free_ilp_env(ilp_env_t *ienv);
 			name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
 
 #endif
-
-#endif
diff --git a/ir/lpp/lpp_cplex.c b/ir/lpp/lpp_cplex.c
index d6a1f3b42..f6270fa8c 100644
--- a/ir/lpp/lpp_cplex.c
+++ b/ir/lpp/lpp_cplex.c
@@ -4,12 +4,15 @@
  * Copyright:   (c) Universitaet Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
+#include "config.h"
 
 #include "lpp_cplex.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef WITH_CPLEX
+
 
 #ifdef _WIN32
 #include <malloc.h>
@@ -266,3 +269,5 @@ void lpp_solve_cplex(lpp_t *lpp) {
 	cpx_solve(cpx);
 	free_cpx(cpx);
 }
+
+#endif
-- 
2.20.1