diff -r 324c291a8daf -r 37d1b20cd9ef src/test/Makefile.am
--- a/src/test/Makefile.am	Sun Apr 24 22:30:54 2005 +0000
+++ b/src/test/Makefile.am	Mon Apr 25 08:19:38 2005 +0000
@@ -35,7 +35,11 @@
 
 if HAVE_GLPK
 check_PROGRAMS += lp_test
-endif
+else !HAVE_GLPK
+if HAVE_CPLEX
+check_PROGRAMS += lp_test
+endif HAVE_CPLEX
+endif !HAVE_GLPK
 
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = test_tools_fail$(EXEEXT)
@@ -62,5 +66,4 @@
 heap_test_SOURCES = heap_test.cc
 
 lp_test_SOURCES = lp_test.cc
-lp_test_CXXFLAGS = $(GLPK_CFLAGS)
-lp_test_LDFLAGS = $(GLPK_LIBS)
+lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)