1.1 --- a/src/test/Makefile.am	Sun Apr 24 22:30:54 2005 +0000
     1.2 +++ b/src/test/Makefile.am	Mon Apr 25 08:19:38 2005 +0000
     1.3 @@ -35,7 +35,11 @@
     1.4  
     1.5  if HAVE_GLPK
     1.6  check_PROGRAMS += lp_test
     1.7 -endif
     1.8 +else !HAVE_GLPK
     1.9 +if HAVE_CPLEX
    1.10 +check_PROGRAMS += lp_test
    1.11 +endif HAVE_CPLEX
    1.12 +endif !HAVE_GLPK
    1.13  
    1.14  TESTS = $(check_PROGRAMS)
    1.15  XFAIL_TESTS = test_tools_fail$(EXEEXT)
    1.16 @@ -62,5 +66,4 @@
    1.17  heap_test_SOURCES = heap_test.cc
    1.18  
    1.19  lp_test_SOURCES = lp_test.cc
    1.20 -lp_test_CXXFLAGS = $(GLPK_CFLAGS)
    1.21 -lp_test_LDFLAGS = $(GLPK_LIBS)
    1.22 +lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)