From 231ed56b012b66256021c12c63f6d0a0f9be1458 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier Date: Sun, 19 Jan 2025 23:24:45 +0100 Subject: [PATCH] Removed further outdated Autoconf tests. See commits 09017a3cb and 95c799f57 for details and the corresponding CMake changes. --- config/aclocal.m4 | 192 --- config/configure | 1599 ++------------------- config/configure.in | 81 +- config/confmod | 14 +- config/include/dcmtk/config/osconfig.h.in | 116 -- 5 files changed, 159 insertions(+), 1843 deletions(-) diff --git a/config/aclocal.m4 b/config/aclocal.m4 index 38d2e6c1f1..ed66314c9a 100644 --- a/config/aclocal.m4 +++ b/config/aclocal.m4 @@ -344,30 +344,6 @@ fi rm -f conftest*]) -dnl AC_CHECK_STD_NAMESPACE checks if the C++-Compiler supports the -dnl standard name space. -dnl -dnl AC_CHECK_STD_NAMESPACE -AC_DEFUN(AC_CHECK_STD_NAMESPACE, -[AC_MSG_CHECKING([for C++ standard namespace]) -AH_TEMPLATE(HAVE_STD_NAMESPACE, [Define if ANSI standard C++ includes use std namespace.]) -AC_CACHE_VAL(ac_cv_check_std_namespace, -[AC_TRY_COMPILE_AND_LINK([ -#include -using namespace std; -],[ - cout << "Hello World" << endl; -], eval "ac_cv_check_std_namespace=yes", eval "ac_cv_check_std_namespace=no")dnl -])dnl -if eval "test \"`echo '$ac_cv_check_std_namespace'`\" = yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STD_NAMESPACE) -else - AC_MSG_RESULT(no) -fi -]) - - dnl AC_CHECK_GNU_LIBTOOL checks whether libtool is GNU libtool. dnl This macro requires that 'libtool' exists in the current path, dnl i.e. AC_CHECK_PROGS(LIBTOOL, libtool, :) should be executed and evaluated @@ -514,75 +490,6 @@ fi ]) -dnl AC_CHECK_INTP_ACCEPT checks if the prototype for accept() -dnl specifies arguments 2-4 to be int* instead of size_t *. -dnl -dnl AC_CHECK_INTP_ACCEPT(HEADER-FILE..., ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -AC_DEFUN(AC_CHECK_INTP_ACCEPT, -[AC_MSG_CHECKING([ifelse([$1], , [if accept() needs int* parameters], -[if accept() needs int* parameters (in $1)])]) -AH_TEMPLATE(HAVE_INTP_ACCEPT, [Define if your system declares argument 3 of accept() - as int * instead of size_t * or socklen_t *.]) -ifelse([$1], , [ac_includes="" -], -[ac_includes="" -for ac_header in $1 -do - ac_includes="$ac_includes -#include<$ac_header>" -done]) -AC_CACHE_VAL(ac_cv_prototype_intp_accept, -[AC_TRY_COMPILE( -[#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -] -, -[ - int i; - struct sockaddr *addr; - size_t addrlen; - - addr = 0; - addrlen = 0; - i = accept(1, addr, &addrlen); -], -eval "ac_cv_prototype_intp_accept=no", -[AC_TRY_COMPILE( -[#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -] -, -[ - int i; - struct sockaddr *addr; - int addrlen; - - addr = 0; - addrlen = 0; - i = accept(1, addr, &addrlen); -], -eval "ac_cv_prototype_intp_accept=yes", eval "ac_cv_prototype_intp_accept=no")])]) -if eval "test \"`echo $ac_cv_prototype_intp_accept`\" = yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INTP_ACCEPT) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - ifelse([$3], , , [$3]) -fi -]) - - dnl AC_CHECK_PTHREAD_OPTION checks whether the compiler requires the dnl -pthread option to correctly link code containing posix thread calls. dnl This is true for example on FreeBSD. @@ -680,105 +587,6 @@ fi ]) -dnl AC_CHECK_INTP_GETSOCKOPT checks if the prototype for getsockopt() -dnl specifies arguments 5 to be int* instead of size_t *. -dnl -dnl AC_CHECK_INTP_GETSOCKOPT(HEADER-FILE..., ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -AC_DEFUN(AC_CHECK_INTP_GETSOCKOPT, -[AC_MSG_CHECKING([ifelse([$1], , [if getsockopt() needs int* parameters], -[if getsockopt() needs int* parameters (in $1)])]) -AH_TEMPLATE(HAVE_INTP_GETSOCKOPT, [Define if your system declares argument 5 of getsockopt() - as int * instead of size_t * or socklen_t.]) -ifelse([$1], , [ac_includes="" -], -[ac_includes="" -for ac_header in $1 -do - ac_includes="$ac_includes -#include<$ac_header>" -done]) -AC_CACHE_VAL(ac_cv_prototype_intp_getsockopt, -[AC_TRY_COMPILE( -[#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -] -, -[ - int i; - size_t optlen; - i = getsockopt(0, 0, 0, 0, &optlen); -], -eval "ac_cv_prototype_intp_getsockopt=no", -[AC_TRY_COMPILE( -[#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -] -, -[ - int i; - int optlen; - i = getsockopt(0, 0, 0, 0, &optlen); -], -eval "ac_cv_prototype_intp_getsockopt=yes", eval "ac_cv_prototype_intp_getsockopt=no")])]) -if eval "test \"`echo $ac_cv_prototype_intp_getsockopt`\" = yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INTP_GETSOCKOPT) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - ifelse([$3], , , [$3]) -fi -]) - - -dnl AC_CXX_STD_NOTHROW checks if the compiler supports non-throwing new using -dnl std::nothrow. -dnl -AC_DEFUN([AC_CXX_STD_NOTHROW], -[AH_TEMPLATE(HAVE_STD__NOTHROW, [Define if the compiler supports std::nothrow.]) -AC_CACHE_CHECK(whether the compiler supports std::nothrow, -ac_cv_cxx_std_nothrow, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ],[int *i = new (std::nothrow) int], - ac_cv_cxx_std_nothrow=yes, ac_cv_cxx_std_nothrow=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_std_nothrow" = yes; then - AC_DEFINE(HAVE_STD__NOTHROW) -fi -]) - - -dnl AC_CXX_NOTHROW_DELETE checks if the compiler supports non-throwing delete using -dnl std::nothrow. -dnl -AC_DEFUN([AC_CXX_NOTHROW_DELETE], -[AH_TEMPLATE(HAVE_NOTHROW_DELETE, [Define if the compiler supports operator delete (std::nothrow).]) -AC_CACHE_CHECK(whether the compiler supports operator delete (std::nothrow), -ac_cv_cxx_nothrow_delete, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ],[int *i = new (std::nothrow) int; operator delete (i,std::nothrow)], - ac_cv_cxx_nothrow_delete=yes, ac_cv_cxx_nothrow_delete=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_nothrow_delete" = yes; then - AC_DEFINE(HAVE_NOTHROW_DELETE) -fi -]) - - dnl AC_CXX_STATIC_ASSERT checks if the compiler supports static_assert. dnl AC_DEFUN([AC_CXX_STATIC_ASSERT], diff --git a/config/configure b/config/configure index bccca04a15..692c85c290 100755 --- a/config/configure +++ b/config/configure @@ -695,7 +695,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -809,7 +808,6 @@ datadir='${datarootdir}/dcmtk-3.6.9-DEV' sysconfdir='${prefix}/etc/dcmtk-3.6.9-DEV' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/dcmtk-3.6.9-DEV' @@ -1062,15 +1060,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1208,7 +1197,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1361,7 +1350,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9-DEV] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -5566,18 +5554,6 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "sigjmp_buf" "ac_cv_type_sigjmp_buf" "#include -" -if test "x$ac_cv_type_sigjmp_buf" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SIGJMP_BUF 1 -_ACEOF - - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } @@ -5686,47 +5662,23 @@ _ACEOF fi done -for ac_func in itoa atoll -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in bcmp -do : - ac_fn_c_check_func "$LINENO" "bcmp" "ac_cv_func_bcmp" -if test "x$ac_cv_func_bcmp" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BCMP 1 -_ACEOF - -fi -done - -for ac_func in getpid mktemp mkstemp +for ac_func in atoll do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll" +if test "x$ac_cv_func_atoll" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_ATOLL 1 _ACEOF fi done -for ac_func in stat +for ac_func in mkstemp do : - ac_fn_c_check_func "$LINENO" "stat" "ac_cv_func_stat" -if test "x$ac_cv_func_stat" = xyes; then : + ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" +if test "x$ac_cv_func_mkstemp" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STAT 1 +#define HAVE_MKSTEMP 1 _ACEOF fi @@ -5743,18 +5695,6 @@ _ACEOF fi done -for ac_func in strdup index rindex access -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - for ac_func in uname cuserid getlogin getlogin_r do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -5790,17 +5730,6 @@ _ACEOF fi done -for ac_func in listen -do : - ac_fn_c_check_func "$LINENO" "listen" "ac_cv_func_listen" -if test "x$ac_cv_func_listen" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LISTEN 1 -_ACEOF - -fi -done - for ac_func in gethostbyname_r do : ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r" @@ -5824,17 +5753,6 @@ _ACEOF fi done -for ac_func in getrusage -do : - ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" -if test "x$ac_cv_func_getrusage" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETRUSAGE 1 -_ACEOF - -fi -done - for ac_func in gettimeofday do : ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" @@ -5904,17 +5822,6 @@ _ACEOF fi done -for ac_func in vsnprintf -do : - ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" -if test "x$ac_cv_func_vsnprintf" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VSNPRINTF 1 -_ACEOF - -fi -done - for ac_func in popen pclose do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -6008,8 +5915,6 @@ fi - - for ac_func in ftime gmtime_r localtime_r lstat nanosleep fcntl do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -6060,41 +5965,6 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 -$as_echo_n "checking for socklen_t... " >&6; } -if ${ac_cv_type_socklen_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -socklen_t len = 42; return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_socklen_t=yes -else - ac_cv_type_socklen_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 -$as_echo "$ac_cv_type_socklen_t" >&6; } - if test $ac_cv_type_socklen_t != yes; then - $as_echo "#define socklen_t int" >>confdefs.h - - fi - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -6235,22 +6105,6 @@ fi -SAVELIBS="$LIBS" -LIBS="$LIBS -lm" -for ac_func in finite -do : - ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite" -if test "x$ac_cv_func_finite" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FINITE 1 -_ACEOF - -fi -done - -LIBS="$SAVELIBS" - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6259,143 +6113,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports std::nothrow" >&5 -$as_echo_n "checking whether the compiler supports std::nothrow... " >&6; } -if ${ac_cv_cxx_std_nothrow+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int *i = new (std::nothrow) int - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_std_nothrow=yes -else - ac_cv_cxx_std_nothrow=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_std_nothrow" >&5 -$as_echo "$ac_cv_cxx_std_nothrow" >&6; } -if test "$ac_cv_cxx_std_nothrow" = yes; then - $as_echo "#define HAVE_STD__NOTHROW 1" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports operator delete (std::nothrow)" >&5 -$as_echo_n "checking whether the compiler supports operator delete (std::nothrow)... " >&6; } -if ${ac_cv_cxx_nothrow_delete+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int *i = new (std::nothrow) int; operator delete (i,std::nothrow) - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_nothrow_delete=yes -else - ac_cv_cxx_nothrow_delete=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_nothrow_delete" >&5 -$as_echo "$ac_cv_cxx_nothrow_delete" >&6; } -if test "$ac_cv_cxx_nothrow_delete" = yes; then - $as_echo "#define HAVE_NOTHROW_DELETE 1" >>confdefs.h - -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports static_assert" >&5 -$as_echo_n "checking whether the compiler supports static_assert... " >&6; } -if ${ac_cv_cxx_static_assert+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -static_assert(true, "good") - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_cxx_static_assert=yes -else - ac_cv_cxx_static_assert=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_static_assert" >&5 -$as_echo "$ac_cv_cxx_static_assert" >&6; } -if test "$ac_cv_cxx_static_assert" = yes; then - $as_echo "#define HAVE_STATIC_ASSERT 1" >>confdefs.h - -fi - - - DEBUG="-DNDEBUG" DEBUGCXXFLAGS= DEBUGCFLAGS= @@ -6504,6 +6221,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lg++" >&5 $as_echo_n "checking for -lg++... " >&6; } if ${ac_cv_lib_gxx+:} false; then : @@ -6548,13 +6266,15 @@ $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5 -$as_echo_n "checking for main in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_main+:} false; then : +OPENSSLLIBS="" +OPENJPEGLIBS="" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 +$as_echo_n "checking for main in -ldl... " >&6; } +if ${ac_cv_lib_dl_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" +LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6568,33 +6288,31 @@ return main (); } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_nsl_main=yes + ac_cv_lib_dl_main=yes else - ac_cv_lib_nsl_main=no + ac_cv_lib_dl_main=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5 -$as_echo "$ac_cv_lib_nsl_main" >&6; } -if test "x$ac_cv_lib_nsl_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5 +$as_echo "$ac_cv_lib_dl_main" >&6; } +if test "x$ac_cv_lib_dl_main" = xyes; then : - LIBS="-lnsl $LIBS" +OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" fi -if test $ac_cv_lib_nsl_main = no ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : +if test $ac_cv_lib_dl_main = no ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" +LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6604,43 +6322,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char dlopen (); int main () { -return gethostbyname (); +return dlopen (); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostbyname=yes + ac_cv_lib_dl_dlopen=yes else - ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_dl_dlopen=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - LIBS="-lnsl $LIBS" +OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5 -$as_echo_n "checking for main in -lsocket... " >&6; } -if ${ac_cv_lib_socket_main+:} false; then : + +MATHLIBS="" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 +$as_echo_n "checking for main in -lm... " >&6; } +if ${ac_cv_lib_m_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" +LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6654,33 +6372,30 @@ return main (); } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_socket_main=yes + ac_cv_lib_m_main=yes else - ac_cv_lib_socket_main=no + ac_cv_lib_m_main=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5 -$as_echo "$ac_cv_lib_socket_main" >&6; } -if test "x$ac_cv_lib_socket_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5 +$as_echo "$ac_cv_lib_m_main" >&6; } +if test "x$ac_cv_lib_m_main" = xyes; then : - LIBS="-lsocket $LIBS" +MATHLIBS="-lm" fi -if test $ac_cv_lib_socket_main = no ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -$as_echo_n "checking for socket in -lsocket... " >&6; } -if ${ac_cv_lib_socket_socket+:} false; then : +if test $ac_cv_lib_m_main = no ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 +$as_echo_n "checking for sin in -lm... " >&6; } +if ${ac_cv_lib_m_sin+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" +LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6690,189 +6405,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char socket (); +char sin (); int main () { -return socket (); +return sin (); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_socket_socket=yes + ac_cv_lib_m_sin=yes else - ac_cv_lib_socket_socket=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -$as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - -fi - -fi - -OPENSSLLIBS="" -OPENJPEGLIBS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 -$as_echo_n "checking for main in -ldl... " >&6; } -if ${ac_cv_lib_dl_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_dl_main=yes -else - ac_cv_lib_dl_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5 -$as_echo "$ac_cv_lib_dl_main" >&6; } -if test "x$ac_cv_lib_dl_main" = xyes; then : - -OPENSSLLIBS="-ldl" -OPENJPEGLIBS="-ldl" - -fi - -if test $ac_cv_lib_dl_main = no ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - -OPENSSLLIBS="-ldl" -OPENJPEGLIBS="-ldl" - -fi - -fi - -MATHLIBS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 -$as_echo_n "checking for main in -lm... " >&6; } -if ${ac_cv_lib_m_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_main=yes -else - ac_cv_lib_m_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5 -$as_echo "$ac_cv_lib_m_main" >&6; } -if test "x$ac_cv_lib_m_main" = xyes; then : - -MATHLIBS="-lm" - -fi - -if test $ac_cv_lib_m_main = no ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 -$as_echo_n "checking for sin in -lm... " >&6; } -if ${ac_cv_lib_m_sin+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sin (); -int -main () -{ -return sin (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_sin=yes -else - ac_cv_lib_m_sin=no + ac_cv_lib_m_sin=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -7387,18 +6932,6 @@ fi done -for ac_header in fcntl.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" -if test "x$ac_cv_header_fcntl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FCNTL_H 1 -_ACEOF - -fi - -done - for ac_header in fnmatch.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default" @@ -7471,18 +7004,6 @@ fi done -for ac_header in malloc.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" -if test "x$ac_cv_header_malloc_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MALLOC_H 1 -_ACEOF - -fi - -done - for ac_header in mqueue.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "mqueue.h" "ac_cv_header_mqueue_h" "$ac_includes_default" @@ -7567,18 +7088,6 @@ fi done -for ac_header in stdint.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H 1 -_ACEOF - -fi - -done - for ac_header in strings.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" @@ -7603,18 +7112,6 @@ fi done -for ac_header in sys/errno.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/errno.h" "ac_cv_header_sys_errno_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_errno_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_ERRNO_H 1 -_ACEOF - -fi - -done - for ac_header in sys/file.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default" @@ -7687,18 +7184,6 @@ fi done -for ac_header in sys/stat.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_stat_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_STAT_H 1 -_ACEOF - -fi - -done - for ac_header in sys/syscall.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "sys/syscall.h" "ac_cv_header_sys_syscall_h" "$ac_includes_default" @@ -7747,18 +7232,6 @@ fi done -for ac_header in sys/types.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_types_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TYPES_H 1 -_ACEOF - -fi - -done - for ac_header in sys/un.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" @@ -8799,39 +8272,6 @@ if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if ${ac_cv_sizeof_short+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_short" = 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 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_short=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF - - # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -8902,104 +8342,38 @@ _ACEOF # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 -$as_echo_n "checking size of float... " >&6; } -if ${ac_cv_sizeof_float+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +$as_echo_n "checking size of void *... " >&6; } +if ${ac_cv_sizeof_void_p+:} false; then : $as_echo_n "(cached) " >&6 else - if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : + if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : else - if test "$ac_cv_type_float" = yes; then + if test "$ac_cv_type_void_p" = 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 77 "cannot compute sizeof (float) +as_fn_error 77 "cannot compute sizeof (void *) See \`config.log' for more details" "$LINENO" 5; } else - ac_cv_sizeof_float=0 + ac_cv_sizeof_void_p=0 fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 -$as_echo "$ac_cv_sizeof_float" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 +$as_echo "$ac_cv_sizeof_void_p" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_FLOAT $ac_cv_sizeof_float +#define SIZEOF_VOID_P $ac_cv_sizeof_void_p _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 -$as_echo_n "checking size of double... " >&6; } -if ${ac_cv_sizeof_double+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_double" = 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 77 "cannot compute sizeof (double) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_double=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 -$as_echo "$ac_cv_sizeof_double" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_DOUBLE $ac_cv_sizeof_double -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -$as_echo_n "checking size of void *... " >&6; } -if ${ac_cv_sizeof_void_p+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_void_p" = 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 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -$as_echo "$ac_cv_sizeof_void_p" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOID_P $ac_cv_sizeof_void_p -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if ${ac_cv_struct_tm+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9127,516 +8501,12 @@ $as_echo "$ac_cv_have___func___macro" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for feenableexcept (in fenv.h)" >&5 -$as_echo_n "checking prototype for feenableexcept (in fenv.h)... " >&6; } - -: -ac_includes="" -for ac_header in fenv.h -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo feenableexcept | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct feenableexcept(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_FEENABLEEXCEPT 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for _stricmp (in string.h)" >&5 -$as_echo_n "checking prototype for _stricmp (in string.h)... " >&6; } - -: -ac_includes="" -for ac_header in string.h -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo _stricmp | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct _stricmp(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE__STRICMP 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if accept() needs int* parameters (in sys/types.h sys/socket.h)" >&5 -$as_echo_n "checking if accept() needs int* parameters (in sys/types.h sys/socket.h)... " >&6; } - -ac_includes="" -for ac_header in sys/types.h sys/socket.h -do - ac_includes="$ac_includes -#include<$ac_header>" -done -if ${ac_cv_prototype_intp_accept+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif - - -int -main () -{ - - int i; - struct sockaddr *addr; - size_t addrlen; - - addr = 0; - addrlen = 0; - i = accept(1, addr, &addrlen); - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_intp_accept=no" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif - - -int -main () -{ - - int i; - struct sockaddr *addr; - int addrlen; - - addr = 0; - addrlen = 0; - i = accept(1, addr, &addrlen); - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_intp_accept=yes" -else - eval "ac_cv_prototype_intp_accept=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -if eval "test \"`echo $ac_cv_prototype_intp_accept`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_INTP_ACCEPT 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for finite (in math.h)" >&5 -$as_echo_n "checking prototype for finite (in math.h)... " >&6; } - -: -ac_includes="" -for ac_header in math.h -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo finite | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct finite(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_FINITE 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for std::isinf (in cmath)" >&5 -$as_echo_n "checking prototype for std::isinf (in cmath)... " >&6; } - -: -ac_includes="" -for ac_header in cmath -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo std::isinf | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct std::isinf(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_STD__ISINF 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for std::isnan (in cmath)" >&5 -$as_echo_n "checking prototype for std::isnan (in cmath)... " >&6; } - -: -ac_includes="" -for ac_header in cmath -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo std::isnan | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct std::isnan(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_STD__ISNAN 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for flock (in sys/file.h)" >&5 -$as_echo_n "checking prototype for flock (in sys/file.h)... " >&6; } - -: -ac_includes="" -for ac_header in sys/file.h -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo flock | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct flock(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_FLOCK 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostbyname_r (in libc.h unistd.h stdlib.h netdb.h)" >&5 -$as_echo_n "checking prototype for gethostbyname_r (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } - -: -ac_includes="" -for ac_header in libc.h unistd.h stdlib.h netdb.h -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo gethostbyname_r | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes -#ifdef __cplusplus -} -#endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct gethostbyname_r(dummyStruct); - - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" -else - eval "ac_cv_prototype_$tmp_save_1=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_GETHOSTBYNAME_R 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostbyaddr_r (in libc.h unistd.h stdlib.h netdb.h)" >&5 -$as_echo_n "checking prototype for gethostbyaddr_r (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for _stricmp (in string.h)" >&5 +$as_echo_n "checking prototype for _stricmp (in string.h)... " >&6; } + : ac_includes="" -for ac_header in libc.h unistd.h stdlib.h netdb.h +for ac_header in string.h do ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then @@ -9644,7 +8514,7 @@ do #include<$ac_header>" fi done -tmp_save_1=`echo gethostbyaddr_r | tr ' :' '__'` +tmp_save_1=`echo _stricmp | tr ' :' '__'` if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9661,7 +8531,7 @@ typedef union { int member; } dummyStruct; #ifdef __cplusplus extern "C" #endif -dummyStruct gethostbyaddr_r(dummyStruct); +dummyStruct _stricmp(dummyStruct); int @@ -9682,7 +8552,7 @@ fi if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_GETHOSTBYADDR_R 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE__STRICMP 1" >>confdefs.h : else @@ -9690,12 +8560,12 @@ else $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostid (in libc.h unistd.h stdlib.h netdb.h)" >&5 -$as_echo_n "checking prototype for gethostid (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for flock (in sys/file.h)" >&5 +$as_echo_n "checking prototype for flock (in sys/file.h)... " >&6; } : ac_includes="" -for ac_header in libc.h unistd.h stdlib.h netdb.h +for ac_header in sys/file.h do ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then @@ -9703,7 +8573,7 @@ do #include<$ac_header>" fi done -tmp_save_1=`echo gethostid | tr ' :' '__'` +tmp_save_1=`echo flock | tr ' :' '__'` if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9720,7 +8590,7 @@ typedef union { int member; } dummyStruct; #ifdef __cplusplus extern "C" #endif -dummyStruct gethostid(dummyStruct); +dummyStruct flock(dummyStruct); int @@ -9741,7 +8611,7 @@ fi if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_GETHOSTID 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_FLOCK 1" >>confdefs.h : else @@ -9749,12 +8619,12 @@ else $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for strerror_r (in string.h)" >&5 -$as_echo_n "checking prototype for strerror_r (in string.h)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostbyname_r (in libc.h unistd.h stdlib.h netdb.h)" >&5 +$as_echo_n "checking prototype for gethostbyname_r (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } : ac_includes="" -for ac_header in string.h +for ac_header in libc.h unistd.h stdlib.h netdb.h do ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then @@ -9762,7 +8632,7 @@ do #include<$ac_header>" fi done -tmp_save_1=`echo strerror_r | tr ' :' '__'` +tmp_save_1=`echo gethostbyname_r | tr ' :' '__'` if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9779,7 +8649,7 @@ typedef union { int member; } dummyStruct; #ifdef __cplusplus extern "C" #endif -dummyStruct strerror_r(dummyStruct); +dummyStruct gethostbyname_r(dummyStruct); int @@ -9800,7 +8670,7 @@ fi if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_STRERROR_R 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_GETHOSTBYNAME_R 1" >>confdefs.h : else @@ -9808,17 +8678,21 @@ else $as_echo "no" >&6; } fi -if test $ac_cv_prototype_strerror_r = yes ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if strerror_r() returns a char * (in string.h)" >&5 -$as_echo_n "checking if strerror_r() returns a char * (in string.h)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostbyaddr_r (in libc.h unistd.h stdlib.h netdb.h)" >&5 +$as_echo_n "checking prototype for gethostbyaddr_r (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } +: ac_includes="" -for ac_header in string.h +for ac_header in libc.h unistd.h stdlib.h netdb.h do - ac_includes="$ac_includes + ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then + ac_includes="$ac_includes #include<$ac_header>" + fi done -if ${ac_cv_prototype_charp_strerror_r+:} false; then : +tmp_save_1=`echo gethostbyaddr_r | tr ' :' '__'` +if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9830,51 +8704,54 @@ $ac_includes #ifdef __cplusplus } #endif +typedef union { int member; } dummyStruct; +#ifdef __cplusplus +extern "C" +#endif +dummyStruct gethostbyaddr_r(dummyStruct); int main () { - char *buf = 0; - int i = strerror_r(0, buf, 100) - ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_charp_strerror_r=no" + eval "ac_cv_prototype_$tmp_save_1=no" else - eval "ac_cv_prototype_charp_strerror_r=yes" - + eval "ac_cv_prototype_$tmp_save_1=yes" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -if eval "test \"`echo $ac_cv_prototype_charp_strerror_r`\" = yes"; then +if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_CHARP_STRERROR_R 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_GETHOSTBYADDR_R 1" >>confdefs.h : else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getsockopt() needs int* parameters (in sys/types.h sys/socket.h)" >&5 -$as_echo_n "checking if getsockopt() needs int* parameters (in sys/types.h sys/socket.h)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gethostid (in libc.h unistd.h stdlib.h netdb.h)" >&5 +$as_echo_n "checking prototype for gethostid (in libc.h unistd.h stdlib.h netdb.h)... " >&6; } +: ac_includes="" -for ac_header in sys/types.h sys/socket.h +for ac_header in libc.h unistd.h stdlib.h netdb.h do - ac_includes="$ac_includes + ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then + ac_includes="$ac_includes #include<$ac_header>" + fi done -if ${ac_cv_prototype_intp_getsockopt+:} false; then : +tmp_save_1=`echo gethostid | tr ' :' '__'` +if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9886,74 +8763,45 @@ $ac_includes #ifdef __cplusplus } #endif - - -int -main () -{ - - int i; - size_t optlen; - i = getsockopt(0, 0, 0, 0, &optlen); - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_intp_getsockopt=no" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __cplusplus -extern "C" { -#endif -$ac_includes +typedef union { int member; } dummyStruct; #ifdef __cplusplus -} +extern "C" #endif +dummyStruct gethostid(dummyStruct); int main () { - int i; - int optlen; - i = getsockopt(0, 0, 0, 0, &optlen); - ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_intp_getsockopt=yes" + eval "ac_cv_prototype_$tmp_save_1=no" else - eval "ac_cv_prototype_intp_getsockopt=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + eval "ac_cv_prototype_$tmp_save_1=yes" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -if eval "test \"`echo $ac_cv_prototype_intp_getsockopt`\" = yes"; then +if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_INTP_GETSOCKOPT 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_GETHOSTID 1" >>confdefs.h : else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gettimeofday (in sys/time.h unistd.h)" >&5 -$as_echo_n "checking prototype for gettimeofday (in sys/time.h unistd.h)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for strerror_r (in string.h)" >&5 +$as_echo_n "checking prototype for strerror_r (in string.h)... " >&6; } : ac_includes="" -for ac_header in sys/time.h unistd.h +for ac_header in string.h do ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then @@ -9961,7 +8809,7 @@ do #include<$ac_header>" fi done -tmp_save_1=`echo gettimeofday | tr ' :' '__'` +tmp_save_1=`echo strerror_r | tr ' :' '__'` if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9978,7 +8826,7 @@ typedef union { int member; } dummyStruct; #ifdef __cplusplus extern "C" #endif -dummyStruct gettimeofday(dummyStruct); +dummyStruct strerror_r(dummyStruct); int @@ -9999,7 +8847,7 @@ fi if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_GETTIMEOFDAY 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_STRERROR_R 1" >>confdefs.h : else @@ -10007,21 +8855,17 @@ else $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for mktemp (in libc.h unistd.h stdlib.h)" >&5 -$as_echo_n "checking prototype for mktemp (in libc.h unistd.h stdlib.h)... " >&6; } +if test $ac_cv_prototype_strerror_r = yes ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if strerror_r() returns a char * (in string.h)" >&5 +$as_echo_n "checking if strerror_r() returns a char * (in string.h)... " >&6; } -: ac_includes="" -for ac_header in libc.h unistd.h stdlib.h +for ac_header in string.h do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes + ac_includes="$ac_includes #include<$ac_header>" - fi done -tmp_save_1=`echo mktemp | tr ' :' '__'` -if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : +if ${ac_cv_prototype_charp_strerror_r+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10033,45 +8877,47 @@ $ac_includes #ifdef __cplusplus } #endif -typedef union { int member; } dummyStruct; -#ifdef __cplusplus -extern "C" -#endif -dummyStruct mktemp(dummyStruct); int main () { + char *buf = 0; + int i = strerror_r(0, buf, 100) + ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_prototype_$tmp_save_1=no" + eval "ac_cv_prototype_charp_strerror_r=no" else - eval "ac_cv_prototype_$tmp_save_1=yes" + eval "ac_cv_prototype_charp_strerror_r=yes" + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then + +if eval "test \"`echo $ac_cv_prototype_charp_strerror_r`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_MKTEMP 1" >>confdefs.h + $as_echo "#define HAVE_CHARP_STRERROR_R 1" >>confdefs.h : else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for mkstemp (in libc.h unistd.h stdlib.h)" >&5 -$as_echo_n "checking prototype for mkstemp (in libc.h unistd.h stdlib.h)... " >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking prototype for gettimeofday (in sys/time.h unistd.h)" >&5 +$as_echo_n "checking prototype for gettimeofday (in sys/time.h unistd.h)... " >&6; } : ac_includes="" -for ac_header in libc.h unistd.h stdlib.h +for ac_header in sys/time.h unistd.h do ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then @@ -10079,7 +8925,7 @@ do #include<$ac_header>" fi done -tmp_save_1=`echo mkstemp | tr ' :' '__'` +tmp_save_1=`echo gettimeofday | tr ' :' '__'` if eval \${ac_cv_prototype_$tmp_save_1+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10096,7 +8942,7 @@ typedef union { int member; } dummyStruct; #ifdef __cplusplus extern "C" #endif -dummyStruct mkstemp(dummyStruct); +dummyStruct gettimeofday(dummyStruct); int @@ -10117,7 +8963,7 @@ fi if eval "test \"`echo '$''{'ac_cv_prototype_$tmp_save_1'}'`\" = yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_MKSTEMP 1" >>confdefs.h + $as_echo "#define HAVE_PROTOTYPE_GETTIMEOFDAY 1" >>confdefs.h : else @@ -10422,106 +9268,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ standard namespace" >&5 -$as_echo_n "checking for C++ standard namespace... " >&6; } - -if ${ac_cv_check_std_namespace+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5' -cat > conftest.$ac_ext < -using namespace std; - -int main() { - - cout << "Hello World" << endl; - -; return 0; } -EOF -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link_o\""; } >&5 - (eval $ac_link_o) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - rm -rf conftest* - eval "ac_cv_check_std_namespace=yes" - else - echo "configure: failed link was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_check_std_namespace=no" - fi -else - echo "configure: failed compile was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_check_std_namespace=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_check_std_namespace'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_STD_NAMESPACE 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::vfprintf (in cstdarg cstdio)" >&5 -$as_echo_n "checking for std::vfprintf (in cstdarg cstdio)... " >&6; } - -ac_includes="" -for ac_header in cstdarg cstdio -do - ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'}'`\" = yes"; then - ac_includes="$ac_includes -#include<$ac_header>" - fi -done -tmp_save_1=`echo std::vfprintf | tr ' :' '__'` -if eval \${ac_cv_compiles_$tmp_save_1+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes -int -main () -{ -FILE *stream; va_list ap; std::vfprintf(stream, "", ap); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "ac_cv_compiles_$tmp_save_1=yes" -else - eval "ac_cv_compiles_$tmp_save_1=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval "test \"`echo '$''{'ac_cv_compiles_$tmp_save_1'}'`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PROTOTYPE_STD__VFPRINTF 1" >>confdefs.h - - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::vsnprintf (in cstdarg cstdio)" >&5 $as_echo_n "checking for std::vsnprintf (in cstdarg cstdio)... " >&6; } @@ -11977,10 +10723,8 @@ else #endif /* on some platforms, tcpd.h needs stdio.h */ #include - #ifdef HAVE_SYS_TYPES_H /* on some platforms, tcpd.h needs sys/types.h */ #include - #endif #include #ifdef __cplusplus } @@ -13820,39 +12564,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category contiguous is declared" >&5 -$as_echo_n "checking whether iterator category contiguous is declared... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - #include - int main(){typedef std::contiguous_iterator_tag category;return 0;} - - -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - dcmtk_have_iter_cat=yes -else - dcmtk_have_iter_cat=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$dcmtk_have_iter_cat" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_CONTIGUOUS_ITERATOR_CATEGORY 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - - - - CFLAGS="$DEBUGCFLAGS $CFLAGS" CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS" diff --git a/config/configure.in b/config/configure.in index 974bc94ad4..ae8cc5cc94 100644 --- a/config/configure.in +++ b/config/configure.in @@ -224,8 +224,6 @@ AC_CHECK_TYPES(uint64_t) AC_CHECK_TYPES(char16_t) -AC_CHECK_TYPES([sigjmp_buf], [], [], [[#include ]]) - dnl ------------------------------------------------------- dnl Check for libc library functions dnl ------------------------------------------------------- @@ -233,26 +231,20 @@ dnl ------------------------------------------------------- AC_FUNC_MEMCMP AC_TYPE_SIGNAL AC_CHECK_FUNCS(gethostid sysinfo) -AC_CHECK_FUNCS(itoa atoll) -AC_CHECK_FUNCS(bcmp) -AC_CHECK_FUNCS(getpid mktemp mkstemp) -AC_CHECK_FUNCS(stat) +AC_CHECK_FUNCS(atoll) +AC_CHECK_FUNCS(mkstemp) AC_CHECK_FUNCS(malloc_debug) -AC_CHECK_FUNCS(strdup index rindex access) AC_CHECK_FUNCS(uname cuserid getlogin getlogin_r) AC_CHECK_FUNCS(usleep) AC_CHECK_FUNCS(flock lockf) -AC_CHECK_FUNCS(listen) AC_CHECK_FUNCS(gethostbyname_r) AC_CHECK_FUNCS(gethostbyaddr_r getgrnam_r getpwnam_r) -AC_CHECK_FUNCS(getrusage) AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNCS(waitpid) AC_CHECK_FUNCS(getuid geteuid setuid getpwnam getgrnam) AC_CHECK_FUNCS(sleep fork) AC_CHECK_FUNCS(_findfirst) AC_CHECK_FUNCS(strlcpy strlcat) -AC_CHECK_FUNCS(vsnprintf) AC_CHECK_FUNCS(popen pclose) AC_CHECK_FUNCS(readdir_r) AC_FUNC_FSEEKO @@ -261,24 +253,10 @@ dnl ------------------------------------------------------- dnl Check for header files and functions needed by oflog dnl ------------------------------------------------------- -AC_DEFUN([TYPE_SOCKLEN_T], -[ -AH_TEMPLATE(socklen_t, [Define to int if undefined.]) -AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, -[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], [[socklen_t len = 42; return 0;]])],[ac_cv_type_socklen_t=yes],[ac_cv_type_socklen_t=no]) -]) - if test $ac_cv_type_socklen_t != yes; then - AC_DEFINE(socklen_t, int) - fi -]) - AC_CHECK_FUNCS(ftime gmtime_r localtime_r lstat nanosleep fcntl) AC_CHECK_FUNCS(htons htonl ntohs ntohl) AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(syslog.h) -TYPE_SOCKLEN_T AH_TEMPLATE(HAVE_ENAMETOOLONG, [Define if your system provides ENAMETOOLONG errno value.]) AC_COMPILE_IFELSE( @@ -298,25 +276,12 @@ AC_CHECK_FUNCS(fgetln) AC_CHECK_PROTOTYPE(strcasestr, string.h) -dnl ------------------------------------------------------- -dnl Check for libm library functions -dnl ------------------------------------------------------- - -SAVELIBS="$LIBS" -LIBS="$LIBS -lm" -AC_CHECK_FUNCS(finite) -LIBS="$SAVELIBS" - dnl ------------------------------------------------------- dnl Perform remaining tests with C++ compiler dnl ------------------------------------------------------- AC_LANG(C++) -AC_CXX_STD_NOTHROW -AC_CXX_NOTHROW_DELETE -AC_CXX_STATIC_ASSERT - dnl ------------------------------------------------------- dnl Check for Debug Mode dnl ------------------------------------------------------- @@ -416,18 +381,6 @@ dnl ------------------------------------------------------- AC_CHECK_GXXLIB -dnl Some C++ compilers have problems with recursive main calls -dnl (e.g. Sun C++ 4.2). In this case we must test another function -dnl to link. -AC_CHECK_LIB(nsl, main) -if test $ac_cv_lib_nsl_main = no ; then -AC_CHECK_LIB(nsl, gethostbyname) -fi -AC_CHECK_LIB(socket, main) -if test $ac_cv_lib_socket_main = no ; then -AC_CHECK_LIB(socket, socket) -fi - dnl Some newer versions of OpenSSL must be linked against libdl. dnl We just check whether libdl exists and in this case always dnl add -ldl to OPENSSLLIBS. The same applies for OPENJPEG. @@ -476,14 +429,12 @@ AC_CHECK_TCP_H AC_CHECK_HEADERS(alloca.h) AC_CHECK_HEADERS(atomic) AC_CHECK_HEADERS(arpa/inet.h) -AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(fnmatch.h) AC_CHECK_HEADERS(grp.h) AC_CHECK_HEADERS(ieeefp.h) AC_CHECK_HEADERS(io.h) AC_CHECK_HEADERS(iostream) AC_CHECK_HEADERS(libc.h) -AC_CHECK_HEADERS(malloc.h) AC_CHECK_HEADERS(mqueue.h) AC_CHECK_HEADERS(new) AC_CHECK_HEADERS(netdb.h) @@ -491,22 +442,18 @@ AC_CHECK_HEADERS(pthread.h) AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(semaphore.h) AC_CHECK_HEADERS(cstddef) -AC_CHECK_HEADERS(stdint.h) AC_CHECK_HEADERS(strings.h) AC_CHECK_HEADERS(synch.h) -AC_CHECK_HEADERS(sys/errno.h) AC_CHECK_HEADERS(sys/file.h) AC_CHECK_HEADERS(sys/msg.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/select.h) AC_CHECK_HEADERS(sys/socket.h) -AC_CHECK_HEADERS(sys/stat.h) AC_CHECK_HEADERS(sys/syscall.h) AC_CHECK_HEADERS(sys/systeminfo.h) AC_CHECK_HEADERS(sys/time.h) AC_CHECK_HEADERS(sys/timeb.h) -AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(sys/un.h) AC_CHECK_HEADERS(sys/utime.h) AC_CHECK_HEADERS(sys/utsname.h) @@ -737,11 +684,8 @@ dnl ------------------------------------------------------------ AC_TYPEDEF(ssize_t, long) AC_TYPEDEF(pid_t, int) AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(float) -AC_CHECK_SIZEOF(double) AC_CHECK_SIZEOF(void *) AC_STRUCT_TM AC_MY_SYMBOL_EXISTS([__FUNCTION__]) @@ -756,12 +700,7 @@ dnl The following AC_CHECK_* macros _must_ have corresponding entries in dnl the acconfig.h file. This is because the macros are specific to the dnl DCMTK project and are not supported by GNU autoheader. -AC_CHECK_PROTOTYPE(feenableexcept, fenv.h) AC_CHECK_PROTOTYPE(_stricmp, string.h) -AC_CHECK_INTP_ACCEPT(sys/types.h sys/socket.h) -AC_CHECK_PROTOTYPE(finite, math.h) -AC_CHECK_PROTOTYPE(std::isinf, cmath) -AC_CHECK_PROTOTYPE(std::isnan, cmath) AC_CHECK_PROTOTYPE(flock, sys/file.h) AC_CHECK_PROTOTYPE(gethostbyname_r, libc.h unistd.h stdlib.h netdb.h) AC_CHECK_PROTOTYPE(gethostbyaddr_r, libc.h unistd.h stdlib.h netdb.h) @@ -770,23 +709,18 @@ AC_CHECK_PROTOTYPE(strerror_r, string.h) if test $ac_cv_prototype_strerror_r = yes ; then AC_CHECK_CHARP_STRERROR_R(string.h) fi -AC_CHECK_INTP_GETSOCKOPT(sys/types.h sys/socket.h) AC_CHECK_PROTOTYPE(gettimeofday, sys/time.h unistd.h) -AC_CHECK_PROTOTYPE(mktemp, libc.h unistd.h stdlib.h) -AC_CHECK_PROTOTYPE(mkstemp, libc.h unistd.h stdlib.h) AC_CHECK_PROTOTYPE(strcasecmp, string.h) AC_CHECK_PROTOTYPE(strncasecmp, string.h) AC_CHECK_PROTOTYPE(usleep, libc.h unistd.h stdlib.h) AC_CHECK_PROTOTYPE(vsnprintf, stdio.h stdarg.h) AC_CHECK_PROTOTYPE(waitpid, sys/wait.h sys/time.h sys/resource.h) + dnl ------------------------------------------------------- dnl Check for the usage of standard C++ headers dnl ------------------------------------------------------- -AC_CHECK_STD_NAMESPACE -AC_CHECK_COMPILES(std::vfprintf, cstdarg cstdio, - [FILE *stream; va_list ap; std::vfprintf(stream, "", ap);]) AC_CHECK_COMPILES(std::vsnprintf, cstdarg cstdio, [char buf[256]; va_list ap; std::vsnprintf(buf, 0, "", ap);]) @@ -1156,10 +1090,8 @@ AS_HELP_STRING([--without-libwrap], [don't include libwrap support])], #endif /* on some platforms, tcpd.h needs stdio.h */ #include - #ifdef HAVE_SYS_TYPES_H /* on some platforms, tcpd.h needs sys/types.h */ #include - #endif #include #ifdef __cplusplus } @@ -1793,13 +1725,6 @@ AC_TRY_COMPILE([#include ], [AC_MSG_RESULT(no)]) -dnl ------------------------------------------------------- -dnl Test for defined iterator categories -dnl ------------------------------------------------------- - -AC_CHECK_ITERATOR_CATEGORY([contiguous],[HAVE_CONTIGUOUS_ITERATOR_CATEGORY]) - - dnl ------------------------------------------------------- dnl Set optimizer and debug compiler flags dnl ------------------------------------------------------- diff --git a/config/confmod b/config/confmod index 4f45c314ff..0dc1b6366b 100755 --- a/config/confmod +++ b/config/confmod @@ -608,7 +608,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -673,7 +672,6 @@ datadir='${datarootdir}/dcmtk-3.6.9-DEV' sysconfdir='${prefix}/etc/dcmtk-3.6.9-DEV' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/dcmtk-3.6.9-DEV' @@ -926,15 +924,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1072,7 +1061,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1225,7 +1214,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc/dcmtk-3.6.9-DEV] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/config/include/dcmtk/config/osconfig.h.in b/config/include/dcmtk/config/osconfig.h.in index 76f8c71e6c..70cf1b52cf 100644 --- a/config/include/dcmtk/config/osconfig.h.in +++ b/config/include/dcmtk/config/osconfig.h.in @@ -88,9 +88,6 @@ #define ENVIRONMENT_PATH_SEPARATOR ':' #endif -/* Define to 1 if you have the `access' function. */ -#undef HAVE_ACCESS - /* Define to 1 if you have the header file. */ #undef HAVE_ALLOCA_H @@ -112,9 +109,6 @@ /* Define if the compiler supports __attribute__((deprecated("message"))). */ #undef HAVE_ATTRIBUTE_DEPRECATED_MSG -/* Define to 1 if you have the `bcmp' function. */ -#undef HAVE_BCMP - /* Define to 1 if the system has the type `char16_t'. */ #undef HAVE_CHAR16_T @@ -122,9 +116,6 @@ instead of int. */ #undef HAVE_CHARP_STRERROR_R -/* Define if the contiguous iterator category is supported. */ -#undef HAVE_CONTIGUOUS_ITERATOR_CATEGORY - /* Define to 1 if you have the header file. */ #undef HAVE_CSTDDEF @@ -166,15 +157,9 @@ /* Define to 1 if you have the `fcntl' function. */ #undef HAVE_FCNTL -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - /* Define to 1 if you have the `fgetln' function. */ #undef HAVE_FGETLN -/* Define to 1 if you have the `finite' function. */ -#undef HAVE_FINITE - /* Define to 1 if you have the `flock' function. */ #undef HAVE_FLOCK @@ -217,18 +202,12 @@ /* Define to 1 if you have the `getlogin_r' function. */ #undef HAVE_GETLOGIN_R -/* Define to 1 if you have the `getpid' function. */ -#undef HAVE_GETPID - /* Define to 1 if you have the `getpwnam' function. */ #undef HAVE_GETPWNAM /* Define to 1 if you have the `getpwnam_r' function. */ #undef HAVE_GETPWNAM_R -/* Define to 1 if you have the `getrusage' function. */ -#undef HAVE_GETRUSAGE - /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -253,20 +232,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IEEEFP_H -/* Define to 1 if you have the `index' function. */ -#undef HAVE_INDEX - /* Define to 1 if the system has the type `int64_t'. */ #undef HAVE_INT64_T -/* Define if your system declares argument 3 of accept() as int * instead of - size_t * or socklen_t *. */ -#undef HAVE_INTP_ACCEPT - -/* Define if your system declares argument 5 of getsockopt() as int * instead - of size_t * or socklen_t. */ -#undef HAVE_INTP_GETSOCKOPT - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -276,27 +244,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IO_H -/* Define to 1 if you have the `itoa' function. */ -#undef HAVE_ITOA - /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H /* Define to 1 if you have the header file. */ #undef HAVE_LIBC_H -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#undef HAVE_LIBNSL - /* Define to 1 if you have the header file. */ #undef HAVE_LIBPNG_PNG_H -/* Define to 1 if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - -/* Define to 1 if you have the `listen' function. */ -#undef HAVE_LISTEN - /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -312,18 +268,12 @@ /* Define to 1 if you have the `malloc_debug' function. */ #undef HAVE_MALLOC_DEBUG -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP -/* Define to 1 if you have the `mktemp' function. */ -#undef HAVE_MKTEMP - /* Define to 1 if you have the header file. */ #undef HAVE_MQUEUE_H @@ -348,9 +298,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NEW -/* Define if the compiler supports operator delete (std::nothrow). */ -#undef HAVE_NOTHROW_DELETE - /* Define `pid_t' to `int' if does not define. */ #undef HAVE_NO_TYPEDEF_PID_T @@ -482,12 +429,6 @@ typedef unsigned short ushort; /* Define to 1 if you have the `popen' function. */ #undef HAVE_POPEN -/* Define if your system has a prototype for feenableexcept in fenv.h. */ -#undef HAVE_PROTOTYPE_FEENABLEEXCEPT - -/* Define if your system has a prototype for finite in math.h. */ -#undef HAVE_PROTOTYPE_FINITE - /* Define if your system has a prototype for flock in sys/file.h. */ #undef HAVE_PROTOTYPE_FLOCK @@ -507,24 +448,6 @@ typedef unsigned short ushort; unistd.h. */ #undef HAVE_PROTOTYPE_GETTIMEOFDAY -/* Define if your system has a prototype for mkstemp in libc.h unistd.h - stdlib.h. */ -#undef HAVE_PROTOTYPE_MKSTEMP - -/* Define if your system has a prototype for mktemp in libc.h unistd.h - stdlib.h. */ -#undef HAVE_PROTOTYPE_MKTEMP - -/* Define if your system has a prototype for std::isinf in cmath. */ -#undef HAVE_PROTOTYPE_STD__ISINF - -/* Define if your system has a prototype for std::isnan in cmath. */ -#undef HAVE_PROTOTYPE_STD__ISNAN - -/* Define if your system has a prototype for std::vfprintf in cstdarg cstdio. - */ -#undef HAVE_PROTOTYPE_STD__VFPRINTF - /* Define if your system has a prototype for std::vsnprintf in cstdarg cstdio. */ #undef HAVE_PROTOTYPE_STD__VSNPRINTF @@ -567,39 +490,21 @@ typedef unsigned short ushort; /* Define to 1 if you have the `readdir_r' function. */ #undef HAVE_READDIR_R -/* Define to 1 if you have the `rindex' function. */ -#undef HAVE_RINDEX - /* Define to 1 if you have the header file. */ #undef HAVE_SEMAPHORE_H /* Define to 1 if you have the `setuid' function. */ #undef HAVE_SETUID -/* Define to 1 if the system has the type `sigjmp_buf'. */ -#undef HAVE_SIGJMP_BUF - /* Define to 1 if you have the `sleep' function. */ #undef HAVE_SLEEP -/* Define to 1 if you have the `stat' function. */ -#undef HAVE_STAT - -/* Define if the compiler supports static_assert. */ -#undef HAVE_STATIC_ASSERT - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if ANSI standard C++ includes use std namespace. */ -#undef HAVE_STD_NAMESPACE - -/* Define if the compiler supports std::nothrow. */ -#undef HAVE_STD__NOTHROW - /* Define if STL's algorithm should be used. */ #undef HAVE_STL_ALGORITHM @@ -633,9 +538,6 @@ typedef unsigned short ushort; /* Define if STL's vector should be used. */ #undef HAVE_STL_VECTOR -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H @@ -667,9 +569,6 @@ typedef unsigned short ushort; */ #undef HAVE_SYS_DIR_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ERRNO_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_FILE_H @@ -758,9 +657,6 @@ typedef unsigned short ushort; /* Define if variable-length arrays are supported in C. */ #undef HAVE_VLA -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - /* Define to 1 if you have the `waitpid' function. */ #undef HAVE_WAITPID @@ -812,21 +708,12 @@ typedef unsigned short ushort; /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* The size of `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE - -/* The size of `float', as computed by sizeof. */ -#undef SIZEOF_FLOAT - /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT /* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - /* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P @@ -918,9 +805,6 @@ typedef unsigned short ushort; # undef __CHAR_UNSIGNED__ #endif -/* Define to int if undefined. */ -#undef socklen_t - #if defined(HAVE_CXX11) && defined(__cplusplus) && __cplusplus < 201103L #error \ DCMTK was configured to use C++11 features, but your compiler does not or was not configured to provide them.