Index: src/demo/Makefile.am
===================================================================
--- src/demo/Makefile.am	(revision 1381)
+++ src/demo/Makefile.am	(revision 1387)
@@ -1,15 +1,4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 LDADD = $(top_builddir)/src/lemon/libemon.la
-
-if HAVE_GLPK
-LP_CFLAGS = $(GLPK_CFLAGS) -DHAVE_GLPK
-LP_LIBS = $(GLPK_LIBS)
-else !HAVE_GLPK
-if HAVE_CPLEX
-LP_CFLAGS = $(CPLEX_CFLAGS) -DHAVE_CPLEX
-LP_LIBS = $(CPLEX_LIBS)
-endif HAVE_CPLEX
-endif !HAVE_GLPK
-
 
 EXTRA_DIST = sub_graph_wrapper_demo.dim
@@ -44,8 +33,6 @@
 
 lp_demo_SOURCES = lp_demo.cc
-lp_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_demo_LDFLAGS = $(LP_LIBS)
+lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
 
 lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
-lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_maxflow_demo_LDFLAGS = $(LP_LIBS)
+lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
Index: src/demo/lp_demo.cc
===================================================================
--- src/demo/lp_demo.cc	(revision 1381)
+++ src/demo/lp_demo.cc	(revision 1387)
@@ -1,2 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iostream>
 
Index: src/demo/lp_maxflow_demo.cc
===================================================================
--- src/demo/lp_maxflow_demo.cc	(revision 1381)
+++ src/demo/lp_maxflow_demo.cc	(revision 1387)
@@ -1,2 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>