Index: src/test/Makefile.am
===================================================================
--- src/test/Makefile.am	(revision 1324)
+++ src/test/Makefile.am	(revision 1349)
@@ -3,4 +3,5 @@
 
 EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
+
 noinst_HEADERS = \
 	test_tools.h \
@@ -19,7 +20,6 @@
 	graph_utils_test \
 	kruskal_test \
-	lp_test \
-        max_matching_test \
-        maps_test \
+	max_matching_test \
+	maps_test \
 	min_cost_flow_test \
 	suurballe_test \
@@ -33,4 +33,8 @@
 	xy_test \
 	heap_test
+
+if HAVE_GLPK
+check_PROGRAMS += lp_test
+endif
 
 TESTS = $(check_PROGRAMS)
@@ -58,5 +62,5 @@
 heap_test_SOURCES = heap_test.cc
 
-lp_test_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
 lp_test_SOURCES = lp_test.cc
-
+lp_test_CXXFLAGS = $(GLPK_CFLAGS)
+lp_test_LDFLAGS = $(GLPK_LIBS)