diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 11:12:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 11:12:00 +0200 |
| commit | de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd (patch) | |
| tree | b2abe728e91199b50c25732da22b1e623b395b5b /nxproxy | |
| parent | 39ee56f5dbe968cddebf6e7891667a2cf8b5af76 (diff) | |
| parent | ceac077637d147b54abeeb4f0154bf152ba13138 (diff) | |
| download | nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.tar.gz nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.tar.bz2 nx-libs-de3d9ff4ee51f3f9125d4a76cc21747c0613b8fd.zip | |
Merge branch 'theqvd-improved-logging' into 3.6.x
Attributes GH PR #193: https://github.com/ArcticaProject/nx-libs/pull/193
Diffstat (limited to 'nxproxy')
| -rw-r--r-- | nxproxy/configure.ac | 6 | ||||
| l--------- | nxproxy/m4/ax_cxx_compile_stdcxx.m4 | 1 | ||||
| l--------- | nxproxy/m4/ax_cxx_compile_stdcxx_11.m4 | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index 9663fb4a8..cc8e898fc 100644 --- a/nxproxy/configure.ac +++ b/nxproxy/configure.ac @@ -23,6 +23,12 @@ AC_LANG([C]) NX_COMPILER_BRAND NX_DEFAULT_OPTIONS +AC_ARG_ENABLE([cxx11], + [AS_HELP_STRING([--enable-cxx11], + [enable optional features requiring C++11 support (disabled by default)])], + [AS_IF([test x$enableval = xyes], + [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])]) + AC_CONFIG_FILES([ Makefile man/Makefile diff --git a/nxproxy/m4/ax_cxx_compile_stdcxx.m4 b/nxproxy/m4/ax_cxx_compile_stdcxx.m4 new file mode 120000 index 000000000..28ebfd1a6 --- /dev/null +++ b/nxproxy/m4/ax_cxx_compile_stdcxx.m4 @@ -0,0 +1 @@ +../../m4/ax_cxx_compile_stdcxx.m4
\ No newline at end of file diff --git a/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4 b/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4 new file mode 120000 index 000000000..5fbe8790d --- /dev/null +++ b/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4 @@ -0,0 +1 @@ +../../m4/ax_cxx_compile_stdcxx_11.m4
\ No newline at end of file |