fix debian build failure; refs #12

master
Marc Wäckerlin 10 years ago
parent 83530df845
commit cba752892d
  1. 2
      configure.in
  2. 22
      src/mrw/checkcxx11.hxx

@ -27,7 +27,7 @@ m4_define(x_minor, 1)
PACKAGENAME=x_packagename PACKAGENAME=x_packagename
MAJOR=x_major MAJOR=x_major
MINOR=x_minor MINOR=x_minor
BUILDDATE=$(date "+%d.%m.%Y/%H.%M") BUILDDATE=$(date -R)
if svn info . 2>&1 > /dev/null; then if svn info . 2>&1 > /dev/null; then
LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p') LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p')

@ -14,19 +14,21 @@
# if __cplusplus < 201103L # if __cplusplus < 201103L
# if __cplusplus==1 # if __cplusplus==1
# if __APPLE__ # if __APPLE__
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
/// Code is compiled with old non C++11 standard compliant compiler /// Code is compiled with old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible /** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will compilers. These workarounds are deprecated, but will
remain until most compilers fully support C++11. So remain until most compilers fully support C++11. So
this workaround will be removed in future releases, this workaround will be removed in future releases,
when support for C++11 is more common. Only rely on when support for C++11 is more common. Only rely on
this workaround, if you really have to. this workaround, if you really have to. Mac gcc is
Mac gcc is even worse than on other systems. */ even worse than on other systems. */
# define MRW__OLD_PRE11_COMPILER # define MRW__OLD_PRE11_COMPILER
# warning you need a C++11 compliant compiler, on gcc: add -std=c++11 # warning you need a C++11 compliant compiler, on gcc: add -std=c++11
# warning emulating C++11 - this changes the way you use the library # warning emulating C++11 - this changes the way you use the library
# warning this is deprecated and will be removed in future releases # warning this is deprecated and will be removed in future releases
# warning refere to the library documentation for more details # warning refere to the library documentation for more details
# endif
# else # else
// __cplusplus==1 is a known bug in gcc 4.6.3 // __cplusplus==1 is a known bug in gcc 4.6.3
# warning your compiler has a know bug, please upgrade to gcc >= 4.7 # warning your compiler has a know bug, please upgrade to gcc >= 4.7
@ -69,16 +71,16 @@ namespace std {
}; };
# else # else
# warning trying standard C++11 support # warning trying standard C++11 support
# include <memory>
# endif # endif
# elif __APPLE__ # elif __APPLE__ && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
/// Code is compiled with an old non C++11 standard compliant compiler /// Code is compiled with an old non C++11 standard compliant compiler
/** There are workarounds for old non C++11 compatible /** There are workarounds for old non C++11 compatible
compilers. These workarounds are deprecated, but will compilers. These workarounds are deprecated, but will remain
remain until most compilers fully support C++11. So this until most compilers fully support C++11. So this workaround
workaround will be removed in future releases, when support will be removed in future releases, when support for C++11 is
for C++11 is more common. Only rely on this workaround, if more common. Only rely on this workaround, if you really have
you really have to. */ to. */
# define MRW__OLD_PRE11_COMPILER # define MRW__OLD_PRE11_COMPILER
# warning you need a C++11 compliant compiler, on gcc: add -std=c++11 # warning you need a C++11 compliant compiler, on gcc: add -std=c++11
# warning emulating C++11 - this changes the way you use the library # warning emulating C++11 - this changes the way you use the library
@ -96,6 +98,8 @@ namespace std {
}; };
} }
# endif # endif
# else
# include <memory>
# endif # endif
#endif #endif

Loading…
Cancel
Save