Changeset bcbcd2 in git


Ignore:
Timestamp:
Nov 13, 2022, 3:01:56 PM (17 months ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
317c1453d644836d66288dc2a633068067f64ab7
Parents:
c3c704ae428df052f1a454e90db10d6be4c5b98e7afda2f3c573a61d019acbe60473bfe15eda6636
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-13 15:01:56+01:00
git-committer:
GitHub <noreply@github.com>2022-11-13 15:01:56+01:00
Message:
Merge pull request #1158 from fingolfin/mh/autoupdate

Update configure.ac files, avoid obsolete syntax
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    rc3c704 rbcbcd2  
    1111AC_CONFIG_SRCDIR([Singular/tesths.cc])
    1212
    13 AC_CONFIG_HEADER([_config.h])
     13AC_CONFIG_HEADERS([_config.h])
    1414# Add pre'prefixed config
    1515AX_PREFIX_CONFIG_H([singularconfig.h],[],[_config.h])
    … …  
    4343AC_PROG_INSTALL
    4444
    45 AC_HEADER_STDC
    4645AC_CHECK_HEADERS(unistd.h iostream.h fstream.h iomanip.h limits.h sys/time.h sys/times.h asm/sigcontext.h spasm.h)
    4746

  • factory/configure.ac

    rc3c704 rbcbcd2  
    1717AC_CONFIG_MACRO_DIR([../m4])
    1818AC_CONFIG_AUX_DIR([../build-aux])
    19 AC_CONFIG_HEADER([_config.h])
     19AC_CONFIG_HEADERS([_config.h])
    2020
    2121AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
    … …  
    228228#AC_CACHE_VAL(ac_cv_shift,
    229229#  [ LDFLAGS="-L$explicit_libdir $LDFLAGS"
    230 #       AC_TRY_RUN(
    231 #      [ int main() { if (-2 >> 1 == -1) return(0); else return(1); } ],
    232 #      ac_cv_shift=yes, ac_cv_shift=no, ac_cv_shift=yes) ])
     230#       AC_RUN_IFELSE([AC_LANG_SOURCE([[#       int main() { if (-2 >> 1 == -1) return(0); else return(1); } ]])],[#      ac_cv_shift=yes],[ac_cv_shift=no],[ac_cv_shift=yes]) ])
    233231#if test "x$ac_cv_shift" = xyes; then
    234232#  AC_MSG_RESULT(yes)
    … …  
    240238# - check for header files.
    241239#
    242 AC_LANG_CPLUSPLUS
     240AC_LANG([C++])
    243241AC_LANG_PUSH([C++])
    244242
    … …  
    273271# use C to check compiler characteristics instead of C++.  On
    274272# nextstep, checking with C++ may fail.
    275 # AC_LANG_C
     273# AC_LANG([C])
    276274
    277275# cross-compiling ?!
    278 #AC_C_CROSS
     276#
    279277#if test "x$cross_compiling" = xyes; then
    280278#  AC_MSG_WARN([you better specify a cache file to get the values for
    … …  
    313311#
    314312#AC_LANG_SAVE
    315 #AC_LANG_CPLUSPLUS
     313#AC_LANG([C++])
    316314# check whether CXX accepts -fno-rtti
    317315#AC_MSG_CHECKING(whether gcc accepts -fno-rtti)
    … …  
    319317#CXXFLAGS="${CXXFLAGS}"
    320318#AC_CACHE_VAL(ac_cv_cxx_have_rtti,
    321 #AC_TRY_COMPILE(,,ac_cv_cxx_have_rtti=yes,ac_cv_cxx_have_rtti=no)
     319#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_rtti=yes],[ac_cv_cxx_have_rtti=no])
    322320#)
    323321#AC_MSG_RESULT(${ac_cv_cxx_have_rtti})
    … …  
    330328#CXXFLAGS="${CXXFLAGS} -fno-exceptions"
    331329#AC_CACHE_VAL(ac_cv_cxx_have_exceptions,
    332 #AC_TRY_LINK(,,ac_cv_cxx_have_exceptions=yes,ac_cv_cxx_have_exceptions=no)
     330#AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_exceptions=yes],[ac_cv_cxx_have_exceptions=no])
    333331#)
    334332#AC_MSG_RESULT(${ac_cv_cxx_have_exceptions})

  • gfanlib/configure.ac

    rc3c704 rbcbcd2  
    77AC_CONFIG_AUX_DIR([../build-aux])
    88AC_CONFIG_SRCDIR([gfanlib.h])
    9 AC_CONFIG_HEADER([_config.h])
     9AC_CONFIG_HEADERS([_config.h])
    1010
    1111AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
    … …  
    3232SING_WIN_FLAGS
    3333
    34 # Checks for header files.
    35 AC_HEADER_STDC
    36 
    3734# Checks for typedefs, structures, and compiler characteristics.
    3835AC_C_INLINE

  • libpolys/configure.ac

    rc3c704 rbcbcd2  
    44AC_CONFIG_AUX_DIR([../build-aux])
    55AC_CONFIG_SRCDIR([reporter/reporter.h])
    6 AC_CONFIG_HEADER([_config.h])
     6AC_CONFIG_HEADERS([_config.h])
    77
    88AM_MAINTAINER_MODE([enable])
    … …  
    6262AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1], [Define if vsnprintf exists.])])
    6363
    64 # Checks for header files.
    65 AC_HEADER_STDC
    66 AC_STDC_HEADERS
    6764AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h limits.h float.h execinfo.h])
    6865

  • omalloc/configure.ac

    rc3c704 rbcbcd2  
    1111AC_CONFIG_AUX_DIR([../build-aux])
    1212AC_CONFIG_SRCDIR(om_Alloc.c)
    13 AC_CONFIG_HEADER([_config.h])
     13AC_CONFIG_HEADERS([_config.h])
    1414
    1515AC_PROG_CC
    … …  
    155155dnl header file checks
    156156dnl
    157 AC_HEADER_STDC
    158157AC_CHECK_HEADERS(limits.h,,
    159158  AC_MSG_ERROR(Can not compile without limits.h))
    … …  
    217216AC_MSG_CHECKING(whether mmap works)
    218217AC_CACHE_VAL(ac_cv_working_mmap,
    219 AC_TRY_RUN([
     218AC_RUN_IFELSE([AC_LANG_SOURCE([[
    220219#include <stdlib.h>
    221220#include "omMmap.c"
    … …  
    226225    exit(1);
    227226  exit(omVfreeMmap(addr, 128*${ac_cv_pagesize}));
    228 }], ac_cv_working_mmap=yes, ac_cv_working_mmap=no, ac_cv_working_mmap=no))
     227}]])],[ac_cv_working_mmap=yes],[ac_cv_working_mmap=no],[ac_cv_working_mmap=no]))
    229228AC_MSG_RESULT($ac_cv_working_mmap)
    230229if test "$ac_cv_working_mmap" = yes; then
    … …  
    237236dnl
    238237AC_CACHE_CHECK(whether alignment needs to be strict, ac_cv_align_need_strict,
    239 AC_TRY_RUN([
     238AC_RUN_IFELSE([AC_LANG_SOURCE([[
    240239#include <stdlib.h>
    241240int main()
    … …  
    249248  else exit(0);
    250249}
    251 ], ac_cv_align_need_strict=no, ac_cv_align_need_strict=yes, ac_cv_align_need_strict=yes))
     250]])],[ac_cv_align_need_strict=no],[ac_cv_align_need_strict=yes],[ac_cv_align_need_strict=yes]))
    252251
    253252dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    … …  
    311310  AC_MSG_RESULT( (cached) yes)
    312311else
    313 AC_TRY_RUN([
     312AC_RUN_IFELSE([AC_LANG_SOURCE([[
    314313#include <stdlib.h>
    315314#include "$OM_MALLOC_HEADER"
    … …  
    326325  exit(0);
    327326}
    328 ], ac_cv_working_valloc="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}", ac_cv_working_valloc=no, ac_cv_working_valloc=no)
     327]])],[ac_cv_working_valloc="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}"],[ac_cv_working_valloc=no],[ac_cv_working_valloc=no])
    329328if test "${ac_cv_working_valloc}" = no; then
    330329AC_MSG_RESULT(no)
    … …  
    435434AC_MSG_CHECKING(whether GET_RET_ADDR works)
    436435AC_CACHE_VAL(ac_cv_get_return_addr_works,
    437 AC_TRY_RUN([
     436AC_RUN_IFELSE([AC_LANG_SOURCE([[
    438437#include <stdlib.h>
    439438#define OM_GET_RETURN_ADDR_WORKS 1
    … …  
    449448   exit(! test_return_addr());
    450449}
    451 ], ac_cv_get_return_addr_works=yes,
    452    ac_cv_get_return_addr_works=no,
    453    ac_cv_get_return_addr_works=no))
     450]])],[ac_cv_get_return_addr_works=yes],[ac_cv_get_return_addr_works=no],[ac_cv_get_return_addr_works=no]))
    454451AC_MSG_RESULT($ac_cv_get_return_addr_works)
    455452if test "$ac_cv_get_return_addr_works" = yes; then
    … …  
    459456AC_MSG_CHECKING(whether omGetBackTrace works)
    460457AC_CACHE_VAL(ac_cv_get_backtrace_works,
    461 AC_TRY_RUN([
     458AC_RUN_IFELSE([AC_LANG_SOURCE([[
    462459#include <stdio.h>
    463460#include <stdlib.h>
    … …  
    483480   else exit(i+10);
    484481}
    485 ], ac_cv_get_backtrace_works=yes,
    486    ac_cv_get_backtrace_works=no,
    487    ac_cv_get_backtrace_works=no))
     482]])],[ac_cv_get_backtrace_works=yes],[ac_cv_get_backtrace_works=no],[ac_cv_get_backtrace_works=no]))
    488483AC_MSG_RESULT($ac_cv_get_backtrace_works)
    489484if test "$ac_cv_get_backtrace_works" = yes; then
    … …  
    501496AC_MSG_CHECKING(whether addr2line works)
    502497AC_CACHE_VAL(ac_cv_prog_addr2line_works,
    503 AC_TRY_RUN([
     498AC_RUN_IFELSE([AC_LANG_SOURCE([[
    504499#include <stdlib.h>
    505500#define OM_GET_RETURN_ADDR_WORKS 1
    … …  
    529524  else exit (i+10);
    530525}
    531 ], ac_cv_prog_addr2line_works=yes,
    532    ac_cv_prog_addr2line_works=no,
    533    ac_cv_prog_addr2line_works=no))
     526]])],[ac_cv_prog_addr2line_works=yes],[ac_cv_prog_addr2line_works=no],[ac_cv_prog_addr2line_works=no]))
    534527AC_MSG_RESULT($ac_cv_prog_addr2line_works)
    535528
    … …  
    583576
    584577AC_MSG_CHECKING(return type of sbrk)
    585 AC_TRY_LINK(
    586 #define __USE_MISC
     578AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define __USE_MISC
    587579#include <unistd.h>
    588 ,
    589 void *sbrk();
    590 ,
    591 AC_DEFINE(Void_t,void,"Type of void"),
    592 AC_DEFINE(Void_t,char,"Type of void"),
    593 )
     580]], [[void *sbrk();
     581]])],[AC_DEFINE(Void_t,void,"Type of void")],[AC_DEFINE(Void_t,char,"Type of void")])
    594582AC_MSG_RESULT(Void_t)
    595583

  • resources/configure.ac

    rc3c704 rbcbcd2  
    44AC_CONFIG_AUX_DIR([../build-aux])
    55AC_CONFIG_SRCDIR([omFindExec.h])
    6 AC_CONFIG_HEADER([_config.h])
     6AC_CONFIG_HEADERS([_config.h])
    77
    88AM_MAINTAINER_MODE([enable])
    … …  
    2727AC_PROG_INSTALL
    2828
    29 AC_HEADER_STDC
    3029AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h sys/stat.h sys/types.h])
    3130AC_CHECK_FUNCS(readlink getcwd getwd getpwnam setenv putenv)
Note: See TracChangeset for help on using the changeset viewer.