# HG changeset patch # User Akos Ladanyi # Date 2008-09-10 12:23:41 # Node ID 362415050b29c0c5c089847b2985595d373b33e2 # Parent 914c5432be97842b7ed2c1c56052f4147f5155ad Disable checks for ILP solvers. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -31,9 +31,9 @@ fi dnl Checks for libraries. -LX_CHECK_GLPK -LX_CHECK_CPLEX -LX_CHECK_SOPLEX +#LX_CHECK_GLPK +#LX_CHECK_CPLEX +#LX_CHECK_SOPLEX dnl Disable/enable building the demo programs. AC_ARG_ENABLE([demo], @@ -108,10 +108,10 @@ echo C++ compiler.................. : $CXX echo C++ compiles flags............ : $CXXFLAGS echo -echo GLPK support.................. : $lx_glpk_found -echo CPLEX support................. : $lx_cplex_found -echo SOPLEX support................ : $lx_soplex_found -echo +#echo GLPK support.................. : $lx_glpk_found +#echo CPLEX support................. : $lx_cplex_found +#echo SOPLEX support................ : $lx_soplex_found +#echo echo Build benchmarks.............. : $enable_benchmark echo Build demo programs........... : $enable_demo echo Build additional tools........ : $enable_tools diff --git a/lemon/Makefile.am b/lemon/Makefile.am --- a/lemon/Makefile.am +++ b/lemon/Makefile.am @@ -12,9 +12,8 @@ lemon/color.cc \ lemon/random.cc - -lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) -lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) +#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) +#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) lemon_HEADERS += \ lemon/arg_parser.h \ diff --git a/lemon/lemon.pc.in b/lemon/lemon.pc.in --- a/lemon/lemon.pc.in +++ b/lemon/lemon.pc.in @@ -6,5 +6,5 @@ Name: @PACKAGE_NAME@ Description: Library of Efficient Models and Optimization in Networks Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ -Cflags: -I${includedir} @GLPK_CFLAGS@ @CPLEX_CFLAGS@ +Libs: -L${libdir} -lemon +Cflags: -I${includedir}