1.1 --- a/CMakeLists.txt Tue Apr 28 13:38:06 2009 +0100
1.2 +++ b/CMakeLists.txt Mon Apr 27 20:02:37 2009 +0100
1.3 @@ -17,7 +17,7 @@
1.4 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
1.5
1.6 INCLUDE(CheckTypeSize)
1.7 -CHECK_TYPE_SIZE("long long" LONG_LONG)
1.8 +CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
1.9
1.10 ENABLE_TESTING()
1.11
2.1 --- a/configure.ac Tue Apr 28 13:38:06 2009 +0100
2.2 +++ b/configure.ac Mon Apr 27 20:02:37 2009 +0100
2.3 @@ -27,7 +27,7 @@
2.4 dnl Check the existence of long long type.
2.5 AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
2.6 if test x"$long_long_found" = x"yes"; then
2.7 - AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
2.8 + AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
2.9 fi
2.10
2.11 dnl Checks for programs.
3.1 --- a/lemon/bits/default_map.h Tue Apr 28 13:38:06 2009 +0100
3.2 +++ b/lemon/bits/default_map.h Mon Apr 27 20:02:37 2009 +0100
3.3 @@ -97,7 +97,7 @@
3.4 };
3.5
3.6
3.7 -#if defined HAVE_LONG_LONG
3.8 +#if defined LEMON_HAVE_LONG_LONG
3.9
3.10 // long long
3.11 template <typename _Graph, typename _Item>
4.1 --- a/lemon/config.h.cmake Tue Apr 28 13:38:06 2009 +0100
4.2 +++ b/lemon/config.h.cmake Mon Apr 27 20:02:37 2009 +0100
4.3 @@ -1,1 +1,1 @@
4.4 -#cmakedefine HAVE_LONG_LONG 1
4.5 \ No newline at end of file
4.6 +#cmakedefine LEMON_HAVE_LONG_LONG 1
5.1 --- a/lemon/config.h.in Tue Apr 28 13:38:06 2009 +0100
5.2 +++ b/lemon/config.h.in Mon Apr 27 20:02:37 2009 +0100
5.3 @@ -1,8 +1,8 @@
5.4 /* Define to 1 if you have CPLEX. */
5.5 -#undef HAVE_CPLEX
5.6 +#undef LEMON_HAVE_CPLEX
5.7
5.8 /* Define to 1 if you have GLPK. */
5.9 -#undef HAVE_GLPK
5.10 +#undef LEMON_HAVE_GLPK
5.11
5.12 /* Define to 1 if you have long long */
5.13 -#undef HAVE_LONG_LONG
5.14 +#undef LEMON_HAVE_LONG_LONG
6.1 --- a/m4/lx_check_cplex.m4 Tue Apr 28 13:38:06 2009 +0100
6.2 +++ b/m4/lx_check_cplex.m4 Mon Apr 27 20:02:37 2009 +0100
6.3 @@ -61,7 +61,7 @@
6.4 LIBS="$lx_save_libs"
6.5
6.6 if test x"$lx_cplex_found" = x"yes"; then
6.7 - AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
6.8 + AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
6.9 AC_MSG_RESULT([yes])
6.10 else
6.11 CPLEX_CFLAGS=""
7.1 --- a/m4/lx_check_glpk.m4 Tue Apr 28 13:38:06 2009 +0100
7.2 +++ b/m4/lx_check_glpk.m4 Mon Apr 27 20:02:37 2009 +0100
7.3 @@ -59,7 +59,7 @@
7.4 LIBS="$lx_save_libs"
7.5
7.6 if test x"$lx_glpk_found" = x"yes"; then
7.7 - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
7.8 + AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
7.9 AC_MSG_RESULT([yes])
7.10 else
7.11 GLPK_CFLAGS=""
8.1 --- a/m4/lx_check_soplex.m4 Tue Apr 28 13:38:06 2009 +0100
8.2 +++ b/m4/lx_check_soplex.m4 Mon Apr 27 20:02:37 2009 +0100
8.3 @@ -55,7 +55,7 @@
8.4 LIBS="$lx_save_libs"
8.5
8.6 if test x"$lx_soplex_found" = x"yes"; then
8.7 - AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
8.8 + AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
8.9 AC_MSG_RESULT([yes])
8.10 else
8.11 SOPLEX_CXXFLAGS=""