# HG changeset patch
# User Akos Ladanyi <ladanyi@tmit.bme.hu>
# Date 1221042221 -3600
# Node ID 362415050b29c0c5c089847b2985595d373b33e2
# Parent 914c5432be97842b7ed2c1c56052f4147f5155ad
Disable checks for ILP solvers.
diff --git a/configure.ac b/configure.ac
|
a
|
b
|
|
| 31 | 31 | fi |
| 32 | 32 | |
| 33 | 33 | dnl Checks for libraries. |
| 34 | | |
| 35 | | |
| 36 | | |
| | 34 | #LX_CHECK_GLPK |
| | 35 | #LX_CHECK_CPLEX |
| | 36 | #LX_CHECK_SOPLEX |
| 37 | 37 | |
| 38 | 38 | dnl Disable/enable building the demo programs. |
| 39 | 39 | AC_ARG_ENABLE([demo], |
| … |
… |
|
| 108 | 108 | echo C++ compiler.................. : $CXX |
| 109 | 109 | echo C++ compiles flags............ : $CXXFLAGS |
| 110 | 110 | echo |
| 111 | | |
| 112 | | |
| 113 | | |
| 114 | | |
| | 111 | #echo GLPK support.................. : $lx_glpk_found |
| | 112 | #echo CPLEX support................. : $lx_cplex_found |
| | 113 | #echo SOPLEX support................ : $lx_soplex_found |
| | 114 | #echo |
| 115 | 115 | echo Build benchmarks.............. : $enable_benchmark |
| 116 | 116 | echo Build demo programs........... : $enable_demo |
| 117 | 117 | echo Build additional tools........ : $enable_tools |
diff --git a/lemon/Makefile.am b/lemon/Makefile.am
|
a
|
b
|
|
| 12 | 12 | lemon/color.cc \ |
| 13 | 13 | lemon/random.cc |
| 14 | 14 | |
| 15 | | |
| 16 | | lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) |
| 17 | | lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) |
| | 15 | #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) |
| | 16 | #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) |
| 18 | 17 | |
| 19 | 18 | lemon_HEADERS += \ |
| 20 | 19 | lemon/arg_parser.h \ |
diff --git a/lemon/lemon.pc.in b/lemon/lemon.pc.in
|
a
|
b
|
|
| 6 | 6 | Name: @PACKAGE_NAME@ |
| 7 | 7 | Description: Library of Efficient Models and Optimization in Networks |
| 8 | 8 | Version: @PACKAGE_VERSION@ |
| 9 | | Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ |
| 10 | | Cflags: -I${includedir} @GLPK_CFLAGS@ @CPLEX_CFLAGS@ |
| | 9 | Libs: -L${libdir} -lemon |
| | 10 | Cflags: -I${includedir} |
