Skip to content

Commit

Permalink
Removed "arith.h" depencency also from Autoconf.
Browse files Browse the repository at this point in the history
Removed the dependency of the generated "arith.h" file also from the
Autoconf build system. See commit eeb7f7e for details.

Updated Makefile dependencies.
  • Loading branch information
jriesmeier committed Mar 4, 2024
1 parent ed515c1 commit 5714b4c
Show file tree
Hide file tree
Showing 55 changed files with 1,002 additions and 1,965 deletions.
15 changes: 3 additions & 12 deletions config/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SHELL = /bin/sh
include @common_makefile@


all: include/dcmtk/config/arith.h
all:

install: all install-doc

Expand Down Expand Up @@ -41,7 +41,6 @@ check-exhaustive: tests-all
include-install:
./mkinstalldirs $(DESTDIR)$(includedir)/dcmtk/config
$(INSTALL_DATA) include/dcmtk/config/osconfig.h $(DESTDIR)$(includedir)/dcmtk/config
$(INSTALL_DATA) include/dcmtk/config/arith.h $(DESTDIR)$(includedir)/dcmtk/config

docs-install:
./mkinstalldirs $(DESTDIR)$(docdir)
Expand All @@ -57,13 +56,5 @@ clean:
rm -rf $(TRASH)

distclean:
(cd include/dcmtk/config && rm -f $(DISTTRASH) osconfig.h arith.h)
rm -rf $(DISTTRASH) Makefile.def lzwtest.tif arith

include/dcmtk/config/arith.h: arith
./arith $@

arith: tests/arith.cc
$(CXX) $(CXXFLAGS) -Iinclude -I../ofstd/include -I../ofstd/libsrc -o$@ tests/$@.cc

dependencies: include/dcmtk/config/arith.h
(cd include/dcmtk/config && rm -f $(DISTTRASH) osconfig.h)
rm -rf $(DISTTRASH) Makefile.def lzwtest.tif
53 changes: 2 additions & 51 deletions config/configure
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,6 @@ enable_cxx11
enable_stl
enable_stl_vector
enable_stl_algorithm
enable_stl_limits
enable_stl_list
enable_stl_map
enable_stl_memory
Expand Down Expand Up @@ -1416,8 +1415,6 @@ Optional Features:
--disable-stl-vector do not use C++ STL vector
--enable-stl-algorithm use C++ STL algorithm
--disable-stl-algorithm do not use C++ STL algorithm
--enable-stl-limits use C++ STL limits
--disable-stl-limits do not use C++ STL limits
--enable-stl-list use C++ STL list
--disable-stl-list do not use C++ STL list
--enable-stl-map use C++ STL map
Expand Down Expand Up @@ -11876,7 +11873,7 @@ if ${ac_cv_check_std_namespace+:} false; then :
else
ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5'
cat > conftest.$ac_ext <<EOF
#line 11879 "configure"
#line 11876 "configure"
#include "confdefs.h"
#include <iostream>
Expand Down Expand Up @@ -12126,7 +12123,7 @@ if ${ac_cv_check_std_namespace+:} false; then :
else
ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5'
cat > conftest.$ac_ext <<EOF
#line 12129 "configure"
#line 12126 "configure"
#include "confdefs.h"
#include <iostream>
Expand Down Expand Up @@ -15224,52 +15221,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_enable_stl_algorithm" >&5
$as_echo "$ac_enable_stl_algorithm" >&6; }
ac_enable_stl_limits="auto"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable STL limits support" >&5
$as_echo_n "checking whether to enable STL limits support... " >&6; }
# Check whether --enable-stl-limits was given.
if test "${enable_stl_limits+set}" = set; then :
enableval=$enable_stl_limits; case "$enableval" in
yes)
ac_enable_stl_limits="yes"
;;
*)
ac_enable_stl_limits="no"
;;
esac
fi
if test "$ac_enable_stl_limits" = "auto"; then
ac_enable_stl_limits="$ac_enable_stl"
fi
if test "$ac_enable_stl_limits" = "yes"; then
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "tests/limits.cc"
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
$as_echo "#define HAVE_STL_LIMITS 1" >>confdefs.h
else
ac_enable_stl_limits="unsupported -> no"
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_enable_stl_limits" >&5
$as_echo "$ac_enable_stl_limits" >&6; }
ac_enable_stl_list="auto"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable STL list support" >&5
$as_echo_n "checking whether to enable STL list support... " >&6; }
Expand Down
23 changes: 0 additions & 23 deletions config/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -1632,29 +1632,6 @@ if test "$ac_enable_stl_algorithm" = "yes"; then
fi
AC_MSG_RESULT($ac_enable_stl_algorithm)

ac_enable_stl_limits="auto"
AC_MSG_CHECKING(whether to enable STL limits support)
AC_ARG_ENABLE(stl-limits,
[ --enable-stl-limits use C++ STL limits
--disable-stl-limits do not use C++ STL limits],
[ case "$enableval" in
yes)
ac_enable_stl_limits="yes"
;;

*)
ac_enable_stl_limits="no"
;;
esac ]
)
if test "$ac_enable_stl_limits" = "auto"; then
ac_enable_stl_limits="$ac_enable_stl"
fi
if test "$ac_enable_stl_limits" = "yes"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include "tests/limits.cc"]])], [AC_DEFINE(HAVE_STL_LIMITS, 1, [Define if STL's limits should be used.])], [ac_enable_stl_limits="unsupported -> no"])
fi
AC_MSG_RESULT($ac_enable_stl_limits)

ac_enable_stl_list="auto"
AC_MSG_CHECKING(whether to enable STL list support)
AC_ARG_ENABLE(stl-list,
Expand Down
3 changes: 0 additions & 3 deletions config/include/dcmtk/config/osconfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,6 @@ typedef unsigned short ushort;
/* Define if STL's algorithm should be used. */
#undef HAVE_STL_ALGORITHM

/* Define if STL's limits should be used. */
#undef HAVE_STL_LIMITS

/* Define if STL's list should be used. */
#undef HAVE_STL_LIST

Expand Down
Loading

0 comments on commit 5714b4c

Please # to comment.