LEMON/LEMON-official Changeset - r691:8d289c89d43e

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r691:8d289c89d43e

« 686:72ac25
« 690:f3792d

693:e01957 »

r691:8d289c89d43e

Wed, 29 Apr 2009 18:48:41

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

0 23 0

merge default

1 file changed with 213 insertions and 141 deletions:

CMakeLists.txt

Makefile.am

cmake/FindCOIN.cmake

cmake/FindCPLEX.cmake

cmake/FindGLPK.cmake

configure.ac

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/bits/default_map.h

lemon/config.h.cmake

lemon/config.h.in

lemon/core.h

lemon/lp.h

m4/lx_check_coin.m4

m4/lx_check_cplex.m4

m4/lx_check_glpk.m4

m4/lx_check_soplex.m4

scripts/unify-sources.sh

test/CMakeLists.txt

test/lp_test.cc

test/mip_test.cc

tools/dimacs-solver.cc

↑ Collapse diff ↑

0 comments (0 inline)

@@ -19,4 +19,2 @@
 		ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 		IF(MSVC)
@@ -31,3 +29,3 @@
 		INCLUDE(CheckTypeSize)
-		CHECK_TYPE_SIZE("long long" LONG_LONG)
+		CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)

@@ -13,7 +13,8 @@
 			m4/lx_check_soplex.m4 \
 			m4/lx_check_clp.m4 \
 			m4/lx_check_cbc.m4 \
 			m4/lx_check_coin.m4 \
 			CMakeLists.txt \
 			cmake/FindGhostscript.cmake \
 			cmake/FindCPLEX.cmake \
 			cmake/FindGLPK.cmake \
 			cmake/FindCOIN.cmake \
 			cmake/version.cmake.in \

@@ -3,24 +3,44 @@
 		FIND_PATH(COIN_INCLUDE_DIR coin/CoinUtilsConfig.h
 		  PATHS ${COIN_ROOT_DIR}/include)
 		FIND_LIBRARY(COIN_CBC_LIBRARY libCbc
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY libCbcSolver
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_CGL_LIBRARY libCgl
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_CLP_LIBRARY libClp
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY libCoinUtils
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_OSI_LIBRARY libOsi
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_OSI_CBC_LIBRARY libOsiCbc
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_OSI_CLP_LIBRARY libOsiClp
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_OSI_VOL_LIBRARY libOsiVol
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		FIND_LIBRARY(COIN_VOL_LIBRARY libVol
 		  PATHS ${COIN_ROOT_DIR}/lib)
 		  HINTS ${COIN_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(COIN_CBC_LIBRARY
 		  NAMES Cbc libCbc
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
 		  NAMES CbcSolver libCbcSolver
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CGL_LIBRARY
 		  NAMES Cgl libCgl
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CLP_LIBRARY
 		  NAMES Clp libClp
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
 		  NAMES CoinUtils libCoinUtils
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_LIBRARY
 		  NAMES Osi libOsi
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
 		  NAMES OsiCbc libOsiCbc
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
 		  NAMES OsiClp libOsiClp
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
 		  NAMES OsiVol libOsiVol
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_VOL_LIBRARY
 		  NAMES Vol libVol
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
@@ -63,6 +83,6 @@
 		IF(COIN_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
 		  SET(HAVE_CLP TRUE)
 		  SET(HAVE_CBC TRUE)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CLP TRUE)
 		  SET(LEMON_HAVE_CBC TRUE)
 		ENDIF(COIN_FOUND)

 		SET(CPLEX_ROOT_DIR "" CACHE PATH "CPLEX root directory")
 		FIND_PATH(CPLEX_INCLUDE_DIR
 		  ilcplex/cplex.h
 		  PATHS "C:/ILOG/CPLEX91/include")
 		  PATHS "C:/ILOG/CPLEX91/include"
 		  PATHS "/opt/ilog/cplex91/include"
 		  HINTS ${CPLEX_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(CPLEX_LIBRARY
 		  NAMES cplex91
 		  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda")
 		  cplex91
 		  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
 		  PATHS "/opt/ilog/cplex91/bin"
 		  HINTS ${CPLEX_ROOT_DIR}/bin
+		)
@@ -13,3 +20,4 @@
 		  cplex91.dll
-		  PATHS "C:/ILOG/CPLEX91/bin/x86_win32")
 		  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
+		)
@@ -18,2 +26,5 @@
 		  SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY})
 		  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		    SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
 		  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		ENDIF(CPLEX_FOUND)
@@ -23,5 +34,5 @@
 		IF(CPLEX_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_CPLEX TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CPLEX TRUE)
 		ENDIF(CPLEX_FOUND)

 		SET(GLPK_ROOT_DIR "" CACHE PATH "GLPK root directory")
 		SET(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]")
@@ -5,10 +7,42 @@
 		  glpk.h
-		  PATHS ${GLPK_REGKEY}/include)
 		  PATHS ${GLPK_REGKEY}/include
 		  HINTS ${GLPK_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(GLPK_LIBRARY
 		  glpk
 		  PATHS ${GLPK_REGKEY}/lib
 		  HINTS ${GLPK_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(GLPK_LIBRARY
 		  NAMES glpk
-		  PATHS ${GLPK_REGKEY}/lib)
+		IF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
 		  FILE(READ ${GLPK_INCLUDE_DIR}/glpk.h GLPK_GLPK_H)
 		  STRING(REGEX MATCH "define[ ]+GLP_MAJOR_VERSION[ ]+[0-9]+" GLPK_MAJOR_VERSION_LINE "${GLPK_GLPK_H}")
 		  STRING(REGEX REPLACE "define[ ]+GLP_MAJOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MAJOR "${GLPK_MAJOR_VERSION_LINE}")
 		  STRING(REGEX MATCH "define[ ]+GLP_MINOR_VERSION[ ]+[0-9]+" GLPK_MINOR_VERSION_LINE "${GLPK_GLPK_H}")
 		  STRING(REGEX REPLACE "define[ ]+GLP_MINOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MINOR "${GLPK_MINOR_VERSION_LINE}")
 		  SET(GLPK_VERSION_STRING "${GLPK_VERSION_MAJOR}.${GLPK_VERSION_MINOR}")
 		  IF(GLPK_FIND_VERSION)
 		    IF(GLPK_FIND_VERSION_COUNT GREATER 2)
 		      MESSAGE(SEND_ERROR "unexpected version string")
 		    ENDIF(GLPK_FIND_VERSION_COUNT GREATER 2)
 		    MATH(EXPR GLPK_REQUESTED_VERSION "${GLPK_FIND_VERSION_MAJOR}*100 + ${GLPK_FIND_VERSION_MINOR}")
 		    MATH(EXPR GLPK_FOUND_VERSION "${GLPK_VERSION_MAJOR}*100 + ${GLPK_VERSION_MINOR}")
 		    IF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		      SET(GLPK_PROPER_VERSION_FOUND FALSE)
 		    ELSE(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		      SET(GLPK_PROPER_VERSION_FOUND TRUE)
 		    ENDIF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		  ELSE(GLPK_FIND_VERSION)
 		    SET(GLPK_PROPER_VERSION_FOUND TRUE)
 		  ENDIF(GLPK_FIND_VERSION)
 		ENDIF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR)
+		FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_PROPER_VERSION_FOUND)
@@ -23,5 +57,5 @@
 		IF(GLPK_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_GLPK TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_GLPK TRUE)
 		ENDIF(GLPK_FOUND)

RhodeCode

Login to your account

@@ -27,3 +27,3 @@
 		if test x"$long_long_found" = x"yes"; then
-		  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+		  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 		fi

@@ -20,3 +20,3 @@
-		IF(HAVE_GLPK)
+		IF(LEMON_HAVE_GLPK)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
@@ -28,18 +28,18 @@
 		  ENDIF(WIN32)
-		ENDIF(HAVE_GLPK)
+		ENDIF(LEMON_HAVE_GLPK)
-		IF(HAVE_CPLEX)
+		IF(LEMON_HAVE_CPLEX)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
 		  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
-		ENDIF(HAVE_CPLEX)
+		ENDIF(LEMON_HAVE_CPLEX)
-		IF(HAVE_CLP)
+		IF(LEMON_HAVE_CLP)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CLP)
+		ENDIF(LEMON_HAVE_CLP)
-		IF(HAVE_CBC)
+		IF(LEMON_HAVE_CBC)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CBC)
+		ENDIF(LEMON_HAVE_CBC)
@@ -57,1 +57,6 @@
 		  FILES_MATCHING PATTERN "*.h")
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers)

@@ -17,3 +17,4 @@
+		nodist_lemon_HEADERS = lemon/config.h
 		lemon_libemon_la_CXXFLAGS = \
@@ -59,2 +60,3 @@
 			lemon/bin_heap.h \
 			lemon/cbc.h \
 			lemon/circulation.h \

@@ -99,3 +99,3 @@
-		#if defined HAVE_LONG_LONG
+		#if defined LEMON_HAVE_LONG_LONG

 		#cmakedefine HAVE_LONG_LONG 1
 		#cmakedefine HAVE_LP 1
 		#cmakedefine HAVE_MIP 1
 		#cmakedefine HAVE_GLPK 1
 		#cmakedefine HAVE_CPLEX 1
 		#cmakedefine HAVE_CLP 1
-		#cmakedefine HAVE_CBC 1
+		#cmakedefine LEMON_HAVE_LONG_LONG 1
 		#cmakedefine LEMON_HAVE_LP 1
 		#cmakedefine LEMON_HAVE_MIP 1
 		#cmakedefine LEMON_HAVE_GLPK 1
 		#cmakedefine LEMON_HAVE_CPLEX 1
 		#cmakedefine LEMON_HAVE_CLP 1
 		#cmakedefine LEMON_HAVE_CBC 1

 		/* Define to 1 if you have long long */
-		#undef HAVE_LONG_LONG
+		#undef LEMON_HAVE_LONG_LONG
 		/* Define to 1 if you have any LP solver. */
-		#undef HAVE_LP
+		#undef LEMON_HAVE_LP
 		/* Define to 1 if you have any MIP solver. */
-		#undef HAVE_MIP
+		#undef LEMON_HAVE_MIP
 		/* Define to 1 if you have CPLEX. */
-		#undef HAVE_CPLEX
+		#undef LEMON_HAVE_CPLEX
 		/* Define to 1 if you have GLPK. */
-		#undef HAVE_GLPK
+		#undef LEMON_HAVE_GLPK
 		/* Define to 1 if you have SOPLEX */
-		#undef HAVE_SOPLEX
+		#undef LEMON_HAVE_SOPLEX
 		/* Define to 1 if you have CLP */
-		#undef HAVE_CLP
+		#undef LEMON_HAVE_CLP
 		/* Define to 1 if you have CBC */
-		#undef HAVE_CBC
+		#undef LEMON_HAVE_CBC

@@ -24,3 +24,3 @@
-		#include <lemon/core.h>
+		#include <lemon/config.h>
 		#include <lemon/bits/enable_if.h>

@@ -24,9 +24,9 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		#include <lemon/clp.h>
@@ -71,3 +71,3 @@
 		#else
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		# define LEMON_DEFAULT_LP GLPK
@@ -76,3 +76,3 @@
 		  typedef GlpkMip Mip;
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		# define LEMON_DEFAULT_LP CPLEX
@@ -81,6 +81,6 @@
 		  typedef CplexMip Mip;
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		# define DEFAULT_LP SOPLEX
 		  typedef SoplexLp Lp;
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		# define DEFAULT_LP CLP

@@ -57,5 +57,5 @@
 		    if test x"$lx_clp_found" = x"yes"; then
-		      AC_DEFINE([HAVE_CLP], [1], [Define to 1 if you have CLP.])
+		      AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      AC_MSG_RESULT([yes])
@@ -117,7 +117,7 @@
 		      if test x"$lx_cbc_found" = x"yes"; then
-		        AC_DEFINE([HAVE_CBC], [1], [Define to 1 if you have CBC.])
+		        AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
 		        lx_lp_found=yes
-		        AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		        AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		        lx_mip_found=yes
-		        AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+		        AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
 		        AC_MSG_RESULT([yes])

@@ -2,5 +2,10 @@
-		YEAR=`date +2003-%Y`
 		YEAR=`date +%Y`
 		HGROOT=`hg root`
 		function hg_year() {
 		    if [ -n "$(hg st $1)" ]; then
 		        echo $YEAR
+		}
 		# file enumaration modes
@@ -193,3 +198,3 @@
+		 *
-		 * Copyright (C) "$YEAR"
+		 * Copyright (C) 2003-"$(hg_year $1)"
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

@@ -38,14 +38,14 @@
-		IF(HAVE_LP)
+		IF(LEMON_HAVE_LP)
 		  ADD_EXECUTABLE(lp_test lp_test.cc)
 		  SET(LP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CLP)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CLP)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-		  ENDIF(HAVE_CLP)
+		  ENDIF(LEMON_HAVE_CLP)
 		  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
@@ -53,3 +53,3 @@
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
@@ -61,4 +61,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
@@ -68,17 +68,17 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_LP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_LP)
-		IF(HAVE_MIP)
+		IF(LEMON_HAVE_MIP)
 		  ADD_EXECUTABLE(mip_test mip_test.cc)
 		  SET(MIP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CBC)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CBC)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-		  ENDIF(HAVE_CBC)
+		  ENDIF(LEMON_HAVE_CBC)
 		  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
@@ -86,3 +86,3 @@
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
@@ -94,4 +94,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
@@ -101,4 +101,4 @@
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_MIP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_MIP)

@@ -23,7 +23,5 @@
 		#ifdef HAVE_CONFIG_H
 		#include <lemon/config.h>
 		#endif
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
@@ -31,3 +29,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
@@ -35,3 +33,3 @@
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
@@ -39,3 +37,3 @@
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
 		#include <lemon/clp.h>
@@ -381,3 +379,3 @@
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
+		  {
@@ -390,3 +388,3 @@
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		  try {
@@ -401,3 +399,3 @@
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
+		  {
@@ -410,3 +408,3 @@
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
+		  {

@@ -202,3 +202,3 @@
 		    .optionGroup("datatype","int")
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		    .boolOption("long","Use 'long long' for capacities, costs etc.")
@@ -269,3 +269,3 @@
 		    solve<long double>(ap,is,os,desc);
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		  else if(ap.given("long"))