diff -r 115e42a5b0f7 -r 83388a4aa3af src/demo/Makefile.am
--- a/src/demo/Makefile.am	Wed Apr 13 06:49:42 2005 +0000
+++ b/src/demo/Makefile.am	Thu Apr 14 12:02:14 2005 +0000
@@ -1,23 +1,31 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 LDADD = $(top_builddir)/src/lemon/libemon.la
+
 EXTRA_DIST = sub_graph_wrapper_demo.dim
 
-noinst_PROGRAMS = 	dim_to_dot 					\
-			sub_graph_wrapper_demo 				\
-			graph_to_eps_demo 				\
-			lp_demo                                         \
-			dim_to_lgf					\
-			min_route
+noinst_PROGRAMS = \
+	dim_to_dot \
+	dim_to_lgf \
+	graph_to_eps_demo \
+	min_route \
+	sub_graph_wrapper_demo
+
+if HAVE_GLPK
+noinst_PROGRAMS += lp_demo
+endif
 
 dim_to_dot_SOURCES = dim_to_dot.cc
-min_route_SOURCES = min_route.cc
 
-sub_graph_wrapper_demo_SOURCES = sub_graph_wrapper_demo.cc \
-	tight_edge_filter_map.h
+dim_to_lgf_SOURCES = dim_to_lgf.cc
 
 graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
 
-lp_demo_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
+min_route_SOURCES = min_route.cc
+
+sub_graph_wrapper_demo_SOURCES = \
+	sub_graph_wrapper_demo.cc \
+	tight_edge_filter_map.h
+
 lp_demo_SOURCES = lp_demo.cc
-
-dim_to_lgf_SOURCES = dim_to_lgf.cc
\ No newline at end of file
+lp_demo_CXXFLAGS = $(GLPK_CFLAGS)
+lp_demo_LDFLAGS = $(GLPK_LIBS)