# HG changeset patch # User Akos Ladanyi # Date 1240858957 -3600 # Node ID 8a144437db7d8e13b720f3515e3bdaea08a24d31 # Parent d8ca76573eb375bcad7d6d2a89dacb0801bb3bac Prefix macro names with LEMON_ in lemon/config.h (#275) diff -r d8ca76573eb3 -r 8a144437db7d CMakeLists.txt --- a/CMakeLists.txt Tue Apr 28 13:38:06 2009 +0100 +++ b/CMakeLists.txt Mon Apr 27 20:02:37 2009 +0100 @@ -17,7 +17,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H) INCLUDE(CheckTypeSize) -CHECK_TYPE_SIZE("long long" LONG_LONG) +CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) ENABLE_TESTING() diff -r d8ca76573eb3 -r 8a144437db7d configure.ac --- a/configure.ac Tue Apr 28 13:38:06 2009 +0100 +++ b/configure.ac Mon Apr 27 20:02:37 2009 +0100 @@ -27,7 +27,7 @@ dnl Check the existence of long long type. AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no]) 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 dnl Checks for programs. diff -r d8ca76573eb3 -r 8a144437db7d lemon/bits/default_map.h --- a/lemon/bits/default_map.h Tue Apr 28 13:38:06 2009 +0100 +++ b/lemon/bits/default_map.h Mon Apr 27 20:02:37 2009 +0100 @@ -97,7 +97,7 @@ }; -#if defined HAVE_LONG_LONG +#if defined LEMON_HAVE_LONG_LONG // long long template diff -r d8ca76573eb3 -r 8a144437db7d lemon/config.h.cmake --- a/lemon/config.h.cmake Tue Apr 28 13:38:06 2009 +0100 +++ b/lemon/config.h.cmake Mon Apr 27 20:02:37 2009 +0100 @@ -1,1 +1,1 @@ -#cmakedefine HAVE_LONG_LONG 1 \ No newline at end of file +#cmakedefine LEMON_HAVE_LONG_LONG 1 diff -r d8ca76573eb3 -r 8a144437db7d lemon/config.h.in --- a/lemon/config.h.in Tue Apr 28 13:38:06 2009 +0100 +++ b/lemon/config.h.in Mon Apr 27 20:02:37 2009 +0100 @@ -1,8 +1,8 @@ /* 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 long long */ -#undef HAVE_LONG_LONG +#undef LEMON_HAVE_LONG_LONG diff -r d8ca76573eb3 -r 8a144437db7d m4/lx_check_cplex.m4 --- a/m4/lx_check_cplex.m4 Tue Apr 28 13:38:06 2009 +0100 +++ b/m4/lx_check_cplex.m4 Mon Apr 27 20:02:37 2009 +0100 @@ -61,7 +61,7 @@ LIBS="$lx_save_libs" if test x"$lx_cplex_found" = x"yes"; then - AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) + AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) AC_MSG_RESULT([yes]) else CPLEX_CFLAGS="" diff -r d8ca76573eb3 -r 8a144437db7d m4/lx_check_glpk.m4 --- a/m4/lx_check_glpk.m4 Tue Apr 28 13:38:06 2009 +0100 +++ b/m4/lx_check_glpk.m4 Mon Apr 27 20:02:37 2009 +0100 @@ -59,7 +59,7 @@ LIBS="$lx_save_libs" if test x"$lx_glpk_found" = x"yes"; then - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) + AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) AC_MSG_RESULT([yes]) else GLPK_CFLAGS="" diff -r d8ca76573eb3 -r 8a144437db7d m4/lx_check_soplex.m4 --- a/m4/lx_check_soplex.m4 Tue Apr 28 13:38:06 2009 +0100 +++ b/m4/lx_check_soplex.m4 Mon Apr 27 20:02:37 2009 +0100 @@ -55,7 +55,7 @@ LIBS="$lx_save_libs" if test x"$lx_soplex_found" = x"yes"; then - AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) + AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) AC_MSG_RESULT([yes]) else SOPLEX_CXXFLAGS=""