Changes in / [260:c691064dfd4f:258:0310c8984732] in lemon

Files:

• configure.ac (modified) (2 diffs)
• lemon/Makefile.am (modified) (1 diff)
• lemon/lemon.pc.in (modified) (1 diff)

configure.ac

@@ -32 +32 @@
 
 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.
@@ -109 +109 @@
 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

lemon/Makefile.am

@@ -13 +13 @@
         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/lemon.pc.in

@@ -7 +7 @@
 Description: Library of Efficient Models and Optimization in Networks
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lemon
-Cflags: -I${includedir}
+Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@
+Cflags: -I${includedir} @GLPK_CFLAGS@ @CPLEX_CFLAGS@