# HG changeset patch
# User Akos Ladanyi <ladanyi@tmit.bme.hu>
# Date 1240858957 -3600
# Node ID 2bfecde015bc8dab8de245a3010933b2d1c2c2fa
# Parent ea417481687374694bf470b613f39c7070671f55
Prefix macro names with LEMON_ in lemon/config.h (#275)
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
a
|
b
|
|
| 15 | 15 | INCLUDE(FindGhostscript) |
| 16 | 16 | |
| 17 | 17 | INCLUDE(CheckTypeSize) |
| 18 | | CHECK_TYPE_SIZE("long long" L |
| | 18 | CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) |
| 19 | 19 | |
| 20 | 20 | ENABLE_TESTING() |
| 21 | 21 | |
diff --git a/configure.ac b/configure.ac
|
a
|
b
|
|
| 27 | 27 | dnl Check the existence of long long type. |
| 28 | 28 | AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no]) |
| 29 | 29 | if test x"$long_long_found" = x"yes"; then |
| 30 | | AC_DEFINE([ |
| | 30 | AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.]) |
| 31 | 31 | fi |
| 32 | 32 | |
| 33 | 33 | dnl Checks for programs. |
diff --git a/lemon/bits/default_map.h b/lemon/bits/default_map.h
|
a
|
b
|
|
| 97 | 97 | }; |
| 98 | 98 | |
| 99 | 99 | |
| 100 | | #if defined |
| | 100 | #if defined LEMON_HAVE_LONG_LONG |
| 101 | 101 | |
| 102 | 102 | // long long |
| 103 | 103 | template <typename _Graph, typename _Item> |
diff --git a/lemon/config.h.cmake b/lemon/config.h.cmake
|
a
|
b
|
|
| 1 | | #cmakedefine HAVE_LONG_LONG 1 |
| 2 | | No newline at end of file |
| | 1 | #cmakedefine LEMON_HAVE_LONG_LONG 1 |
diff --git a/lemon/config.h.in b/lemon/config.h.in
|
a
|
b
|
|
| 1 | 1 | /* Define to 1 if you have CPLEX. */ |
| 2 | | #undef |
| | 2 | #undef LEMON_HAVE_CPLEX |
| 3 | 3 | |
| 4 | 4 | /* Define to 1 if you have GLPK. */ |
| 5 | | #undef |
| | 5 | #undef LEMON_HAVE_GLPK |
| 6 | 6 | |
| 7 | 7 | /* Define to 1 if you have long long */ |
| 8 | | #undef |
| | 8 | #undef LEMON_HAVE_LONG_LONG |
diff --git a/m4/lx_check_cplex.m4 b/m4/lx_check_cplex.m4
|
a
|
b
|
|
| 61 | 61 | LIBS="$lx_save_libs" |
| 62 | 62 | |
| 63 | 63 | if test x"$lx_cplex_found" = x"yes"; then |
| 64 | | AC_DEFINE([ |
| | 64 | AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) |
| 65 | 65 | AC_MSG_RESULT([yes]) |
| 66 | 66 | else |
| 67 | 67 | CPLEX_CFLAGS="" |
diff --git a/m4/lx_check_glpk.m4 b/m4/lx_check_glpk.m4
|
a
|
b
|
|
| 59 | 59 | LIBS="$lx_save_libs" |
| 60 | 60 | |
| 61 | 61 | if test x"$lx_glpk_found" = x"yes"; then |
| 62 | | AC_DEFINE([ |
| | 62 | AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) |
| 63 | 63 | AC_MSG_RESULT([yes]) |
| 64 | 64 | else |
| 65 | 65 | GLPK_CFLAGS="" |
diff --git a/m4/lx_check_soplex.m4 b/m4/lx_check_soplex.m4
|
a
|
b
|
|
| 55 | 55 | LIBS="$lx_save_libs" |
| 56 | 56 | |
| 57 | 57 | if test x"$lx_soplex_found" = x"yes"; then |
| 58 | | AC_DEFINE([ |
| | 58 | AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) |
| 59 | 59 | AC_MSG_RESULT([yes]) |
| 60 | 60 | else |
| 61 | 61 | SOPLEX_CXXFLAGS="" |
