Skip to content

Commit

Permalink
Autoconf now uses --enable-cxx11 by default.
Browse files Browse the repository at this point in the history
By default, the DCMTK is now compiled with C++11 support when using
Autoconf (and if C++11 is supported by the compiler that is used).

The default settings of the CMake build system with also change soon.
  • Loading branch information
jriesmeier committed Feb 24, 2024
1 parent 3ac1347 commit 39dda21
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
12 changes: 7 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,10 @@ workarounds and fallback implementations. This can be achieved using CMake's
variables "CMAKE_CXX_STANDARD" and "CMAKE_CXX_STANDARD_REQUIRED".
The previous mechanism only handled C++11 and is available on old versions of
CMake (versions prior 3.1.3): set "DCMTK_ENABLE_CXX11" to "ON". For Autoconf,
use the "--enable-cxx11" argument. Both the "DCMTK_ENABLE_CXX11" variable and
Autoconf support are now deprecated and will be removed in a future release.
the configure option "--enable-cxx11" is used by default (starting with DCMTK
3.6.9, before is was disabled by default). Both the "DCMTK_ENABLE_CXX11"
variable and Autoconf support are deprecated and will be removed in a future
release.

Enabling e.g. C++11 will change some parts of DCMTK's API, so a C++11 build of
DCMTK is potentially incompatible with a classic build of DCMTK. This setting
Expand Down Expand Up @@ -1040,8 +1042,8 @@ options are:
--enable-charconv=TYPE enable character set conversion support
(libiconv/libicu/stdlibc/oficonv=default)
--disable-charconv disable character set conversion support
--enable-cxx11 use C++11
--disable-cxx11 do not use C++11 (default)
--enable-cxx11 use C++11 (default)
--disable-cxx11 do not use C++11
--enable-stl use C++ STL
--disable-stl do not use C++ STL (default)

Expand Down Expand Up @@ -1116,4 +1118,4 @@ Have fun.
M. Eichelberg, J. Riesmeier, M. Onken, J. Schlamelcher
DCMTK Development Team, Oldenburg, Germany.

Last revised: 2024-02-19 (Riesmeier)
Last revised: 2024-02-24 (Riesmeier)
6 changes: 3 additions & 3 deletions config/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1408,8 +1408,8 @@ Optional Features:
enable builtin oficonv data files
--disable-builtin-oficonv
disable builtin oficonv data files (default)
--enable-cxx11 use C++11
--disable-cxx11 do not use C++11 (default)
--enable-cxx11 use C++11 (default)
--disable-cxx11 do not use C++11
--enable-stl use C++ STL
--disable-stl do not use C++ STL (default)
--enable-stl-vector use C++ STL vector
Expand Down Expand Up @@ -17660,7 +17660,7 @@ fi



ac_enable_cxx11="no"
ac_enable_cxx11="yes"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable C++11 support" >&5
$as_echo_n "checking whether to enable C++11 support... " >&6; }
# Check whether --enable-cxx11 was given.
Expand Down
6 changes: 3 additions & 3 deletions config/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -1641,11 +1641,11 @@ dnl -------------------------------------------------------
dnl Include config test code from config/tests
dnl -------------------------------------------------------

ac_enable_cxx11="no"
ac_enable_cxx11="yes"
AC_MSG_CHECKING(whether to enable C++11 support)
AC_ARG_ENABLE(cxx11,
[ --enable-cxx11 use C++11
--disable-cxx11 do not use C++11 (default)],
[ --enable-cxx11 use C++11 (default)
--disable-cxx11 do not use C++11],
[ case "$enableval" in
yes)
AC_MSG_RESULT()
Expand Down

0 comments on commit 39dda21

Please sign in to comment.