1.1 --- a/src/demo/Makefile.am	Fri Apr 22 16:20:12 2005 +0000
     1.2 +++ b/src/demo/Makefile.am	Fri Apr 22 17:47:01 2005 +0000
     1.3 @@ -1,6 +1,17 @@
     1.4  AM_CPPFLAGS = -I$(top_srcdir)/src
     1.5  LDADD = $(top_builddir)/src/lemon/libemon.la
     1.6  
     1.7 +if HAVE_GLPK
     1.8 +LP_CFLAGS = $(GLPK_CFLAGS) -DHAVE_GLPK
     1.9 +LP_LIBS = $(GLPK_LIBS)
    1.10 +else !HAVE_GLPK
    1.11 +if HAVE_CPLEX
    1.12 +LP_CFLAGS = $(CPLEX_CFLAGS) -DHAVE_CPLEX
    1.13 +LP_LIBS = $(CPLEX_LIBS)
    1.14 +endif HAVE_CPLEX
    1.15 +endif !HAVE_GLPK
    1.16 +
    1.17 +
    1.18  EXTRA_DIST = sub_graph_wrapper_demo.dim
    1.19  
    1.20  noinst_PROGRAMS = \
    1.21 @@ -12,7 +23,12 @@
    1.22  
    1.23  if HAVE_GLPK
    1.24  noinst_PROGRAMS += lp_demo lp_maxflow_demo
    1.25 -endif
    1.26 +else !HAVE_GLPK
    1.27 +if HAVE_CPLEX
    1.28 +noinst_PROGRAMS += lp_demo lp_maxflow_demo
    1.29 +endif HAVE_CPLEX
    1.30 +endif !HAVE_GLPK
    1.31 +
    1.32  
    1.33  dim_to_dot_SOURCES = dim_to_dot.cc
    1.34  
    1.35 @@ -27,9 +43,9 @@
    1.36  	tight_edge_filter_map.h
    1.37  
    1.38  lp_demo_SOURCES = lp_demo.cc
    1.39 -lp_demo_CXXFLAGS = $(GLPK_CFLAGS)
    1.40 -lp_demo_LDFLAGS = $(GLPK_LIBS)
    1.41 +lp_demo_CXXFLAGS = $(LP_CFLAGS)
    1.42 +lp_demo_LDFLAGS = $(LP_LIBS)
    1.43  
    1.44  lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
    1.45 -lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS)
    1.46 -lp_maxflow_demo_LDFLAGS = $(GLPK_LIBS)
    1.47 +lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
    1.48 +lp_maxflow_demo_LDFLAGS = $(LP_LIBS)