Changeset 0c26a1 in git


Ignore:
Timestamp:
Oct 15, 2021, 4:09:30 PM (2 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
3551885a5d35f5d806aa9a27ec225b51933cd05c
Parents:
69185ceb2807ebeacfe2824621e4b70e2ed19642
Message:
Revert "update configure stuff": requires autoconf 2.7.1

This reverts commit 69185ceb2807ebeacfe2824621e4b70e2ed19642.
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r69185ce r0c26a1  
    1 AC_INIT([singular],[4.2.1],[singular@mathematik.uni-kl.de])
     1AC_INIT([singular], [4.2.1], [singular@mathematik.uni-kl.de])
    22
    33AC_SUBST([VERSION_DATE], 2021)
     
    1111AC_CONFIG_SRCDIR([Singular/tesths.cc])
    1212
    13 AC_CONFIG_HEADERS([_config.h])
     13AC_CONFIG_HEADER([_config.h])
    1414# Add pre'prefixed config
    1515AX_PREFIX_CONFIG_H([singularconfig.h],[],[_config.h])
     
    4343AC_PROG_INSTALL
    4444
    45 # Autoupdate added the next two lines to ensure that your configure
    46 # script's behavior did not change.  They are probably safe to remove.
    47 AC_CHECK_INCLUDES_DEFAULT
    48 AC_PROG_EGREP
    49 
     45AC_HEADER_STDC
    5046AC_CHECK_HEADERS(unistd.h iostream.h sys/time.h sys/times.h asm/sigcontext.h)
    5147
  • factory/configure.ac

    r69185ce r0c26a1  
    1313# - initialisation.
    1414#
    15 AC_INIT([factory],[4.2.1])
     15AC_INIT([factory], [4.2.1])
    1616AC_CONFIG_SRCDIR(canonicalform.cc)
    1717AC_CONFIG_MACRO_DIR([../m4])
    1818AC_CONFIG_AUX_DIR([../build-aux])
    19 AC_CONFIG_HEADERS([_config.h])
     19AC_CONFIG_HEADER([_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_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]) ])
     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) ])
    231233#if test "x$ac_cv_shift" = xyes; then
    232234#  AC_MSG_RESULT(yes)
     
    238240# - check for header files.
    239241#
    240 AC_LANG([C++])
     242AC_LANG_CPLUSPLUS
    241243AC_LANG_PUSH([C++])
    242244
     
    271273# use C to check compiler characteristics instead of C++.  On
    272274# nextstep, checking with C++ may fail.
    273 # AC_LANG([C])
     275# AC_LANG_C
    274276
    275277# cross-compiling ?!
    276 #
     278#AC_C_CROSS
    277279#if test "x$cross_compiling" = xyes; then
    278280#  AC_MSG_WARN([you better specify a cache file to get the values for
     
    311313#
    312314#AC_LANG_SAVE
    313 #AC_LANG([C++])
     315#AC_LANG_CPLUSPLUS
    314316# check whether CXX accepts -fno-rtti
    315317#AC_MSG_CHECKING(whether gcc accepts -fno-rtti)
     
    317319#CXXFLAGS="${CXXFLAGS}"
    318320#AC_CACHE_VAL(ac_cv_cxx_have_rtti,
    319 #AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_rtti=yes],[ac_cv_cxx_have_rtti=no])
     321#AC_TRY_COMPILE(,,ac_cv_cxx_have_rtti=yes,ac_cv_cxx_have_rtti=no)
    320322#)
    321323#AC_MSG_RESULT(${ac_cv_cxx_have_rtti})
     
    328330#CXXFLAGS="${CXXFLAGS} -fno-exceptions"
    329331#AC_CACHE_VAL(ac_cv_cxx_have_exceptions,
    330 #AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_exceptions=yes],[ac_cv_cxx_have_exceptions=no])
     332#AC_TRY_LINK(,,ac_cv_cxx_have_exceptions=yes,ac_cv_cxx_have_exceptions=no)
    331333#)
    332334#AC_MSG_RESULT(${ac_cv_cxx_have_exceptions})
  • gfanlib/configure.ac

    r69185ce r0c26a1  
    22# Process this file with autoconf to produce a configure script.
    33
    4 AC_PREREQ([2.71])
    5 AC_INIT([libgfan],[0.6],[ren@mathematik.uni-kl.de])
     4AC_PREREQ([2.63])
     5AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de])
    66AC_CONFIG_MACRO_DIR([../m4])
    77AC_CONFIG_AUX_DIR([../build-aux])
    88AC_CONFIG_SRCDIR([gfanlib.h])
    9 AC_CONFIG_HEADERS([_config.h])
     9AC_CONFIG_HEADER([_config.h])
    1010
    1111AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
     
    3333
    3434# Checks for header files.
    35 # Autoupdate added the next two lines to ensure that your configure
    36 # script's behavior did not change.  They are probably safe to remove.
    37 AC_CHECK_INCLUDES_DEFAULT
    38 AC_PROG_EGREP
    39 
     35AC_HEADER_STDC
    4036
    4137# Checks for typedefs, structures, and compiler characteristics.
  • libpolys/configure.ac

    r69185ce r0c26a1  
    1 AC_INIT([libpolys],[4.2.1])
     1AC_INIT([libpolys], [4.2.1])
    22
    33AC_CONFIG_MACRO_DIR([../m4])
    44AC_CONFIG_AUX_DIR([../build-aux])
    55AC_CONFIG_SRCDIR([reporter/reporter.h])
    6 AC_CONFIG_HEADERS([_config.h])
     6AC_CONFIG_HEADER([_config.h])
    77
    88AM_MAINTAINER_MODE([enable])
     
    6262
    6363# Checks for header files.
    64 # Autoupdate added the next two lines to ensure that your configure
    65 # script's behavior did not change.  They are probably safe to remove.
    66 AC_CHECK_INCLUDES_DEFAULT
    67 AC_PROG_EGREP
    68 
    69 # Autoupdate added the next two lines to ensure that your configure
    70 # script's behavior did not change.  They are probably safe to remove.
    71 AC_CHECK_INCLUDES_DEFAULT
    72 AC_PROG_EGREP
    73 
     64AC_HEADER_STDC
     65AC_STDC_HEADERS
    7466AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h limits.h float.h execinfo.h])
    7567
  • m4/ax_append_flag.m4

    r69185ce r0c26a1  
    5353
    5454AC_DEFUN([AX_APPEND_FLAG],
    55 [AC_PREREQ([2.71])dnl for _AC_LANG_PREFIX
     55[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
    5656AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
    5757AS_VAR_SET_IF(FLAGS,
  • m4/ax_check_compile_flag.m4

    r69185ce r0c26a1  
    5757
    5858AC_DEFUN([AX_CHECK_COMPILE_FLAG],
    59 [AC_PREREQ([2.71])dnl for _AC_LANG_PREFIX
     59[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
    6060AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
    6161AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
  • m4/ax_cxx_gcc_abi_demangle.m4

    r69185ce r0c26a1  
    3030ax_cv_cxx_gcc_abi_demangle,
    3131[AC_LANG_SAVE
    32  AC_LANG([C++])
    33  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <typeinfo>
     32 AC_LANG_CPLUSPLUS
     33 AC_TRY_COMPILE([#include <typeinfo>
    3434#include <cxxabi.h>
    3535#include <string>
     
    3737template<typename TYPE>
    3838class A {};
    39 ]], [[A<int> instance;
     39],[A<int> instance;
    4040int status = 0;
    4141char* c_name = 0;
     
    4747
    4848return name == "A<int>";
    49 ]])],[ax_cv_cxx_gcc_abi_demangle=yes],[ax_cv_cxx_gcc_abi_demangle=no])
     49],
     50 ax_cv_cxx_gcc_abi_demangle=yes, ax_cv_cxx_gcc_abi_demangle=no)
    5051 AC_LANG_RESTORE
    5152])
  • m4/ax_prog_cc_for_build.m4

    r69185ce r0c26a1  
    4545pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
    4646pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
    47 pushdef([ac_cv_c_compiler_gnu], ac_cv_build_prog_gcc)dnl
     47pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
    4848pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
    4949pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
     
    122122popdef([ac_cv_prog_cc_works])dnl
    123123popdef([ac_cv_prog_cc_c89])dnl
    124 popdef([ac_cv_c_compiler_gnu])dnl
     124popdef([ac_cv_prog_gcc])dnl
    125125popdef([ac_cv_prog_CPP])dnl
    126126
  • m4/ax_prog_cxx_for_build.m4

    r69185ce r0c26a1  
    4444dnl
    4545pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl
    46 pushdef([ac_cv_cxx_compiler_gnu], ac_cv_build_prog_gxx)dnl
     46pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl
    4747pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl
    4848pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl
     
    101101popdef([ac_cv_prog_cxx_cross])dnl
    102102popdef([ac_cv_prog_cxx_works])dnl
    103 popdef([ac_cv_cxx_compiler_gnu])dnl
     103popdef([ac_cv_prog_gxx])dnl
    104104popdef([ac_cv_prog_CXXCPP])dnl
    105105
  • m4/flint-check.m4

    r69185ce r0c26a1  
    5353                LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
    5454
    55                 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <flint/fmpz.h>
    56                             ]], [[fmpz_t x; fmpz_init(x);]])],[
     55                AC_TRY_LINK([#include <flint/fmpz.h>
     56                            ],
     57                            [fmpz_t x; fmpz_init(x);], [
    5758                        flint_found="yes"
    5859                        break
    59                 ],[])
     60                ])
    6061done
    6162
  • m4/gmp-check.m4

    r69185ce r0c26a1  
    3232    CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
    3333    LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
    34     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gmp.h>
    35                 ]], [[mpz_t a; mpz_init (a);]])],[
     34    AC_TRY_LINK([#include <gmp.h>
     35                ],
     36                [mpz_t a; mpz_init (a);], [
    3637      gmp_found=yes
    3738      break
    38     ],[])
     39    ])
    3940done
    4041if test "$gmp_found" != yes; then
  • m4/google-perftools.m4

    r69185ce r0c26a1  
    2323    ac_google_perfdir='no'
    2424    AC_ARG_WITH(google-perftools,
    25         AS_HELP_STRING([--with-google-perftools=DIR],[location of a google perftools installation (default none)]),
     25        AC_HELP_STRING([--with-google-perftools=DIR],
     26            [location of a google perftools installation (default none)]),
    2627        ac_google_perfdir=$withval)
    2728
    2829    AC_ARG_ENABLE(google-profiling,
    29                   AS_HELP_STRING([--enable-google-profiling],[compile with google profiling]),
     30                  AC_HELP_STRING([--enable-google-profiling],
     31                  [compile with google profiling]),
    3032                  [google_profile=$enableval],
    3133                  [google_profile=no])
  • m4/pipe-check.m4

    r69185ce r0c26a1  
    1414  CFLAGS="${CFLAGS} -pipe"
    1515  AC_CACHE_VAL(ac_cv_cxx_have_pipe,
    16   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_cxx_have_pipe=yes],[ac_cv_cxx_have_pipe=no]))
     16  AC_TRY_COMPILE(,,ac_cv_cxx_have_pipe=yes,ac_cv_cxx_have_pipe=no))
    1717  AC_MSG_RESULT(${ac_cv_cxx_have_pipe})
    1818  CFLAGS=${temp_cflags}
  • m4/readline-check.m4

    r69185ce r0c26a1  
    3535if test "$with_readline" != dynamic && test "$with_readline" != no; then
    3636AC_LANG_SAVE
    37 AC_LANG([C++])
     37AC_LANG_CPLUSPLUS
    3838   AC_CHECK_LIB(readline, readline)
    3939   AC_CHECK_HEADERS(readline/readline.h readline/history.h)
     
    4242     AC_MSG_CHECKING(whether readline.h is ok)
    4343     AC_CACHE_VAL(ac_cv_header_readline_readline_h_ok,
    44      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include<unistd.h>
     44     AC_TRY_LINK(
     45#include<unistd.h>
    4546#include<stdio.h>
    4647#include<readline/readline.h>
     
    4849#include<readline/history.h>
    4950#endif
    50 ]], [[]])],[ac_cv_header_readline_readline_h_ok="yes"],[ac_cv_header_readline_readline_h_ok="no"]))
     51,
     52,
     53ac_cv_header_readline_readline_h_ok="yes",
     54ac_cv_header_readline_readline_h_ok="no",
     55))
    5156    AC_MSG_RESULT($ac_cv_header_readline_readline_h_ok)
    5257    if test "$ac_cv_header_readline_readline_h_ok" != yes; then
     
    5459      AC_MSG_CHECKING(whether or not we nevertheless can use readline)
    5560      AC_CACHE_VAL(ac_cv_have_readline,
    56       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
     61      AC_TRY_LINK(
     62#include <stdio.h>
    5763extern "C"
    5864{
     
    7278#define NULL 0
    7379#endif
    74 ]], [[rl_readline_name=NULL;
     80,
     81rl_readline_name=NULL;
    7582*rl_line_buffer=1;
    7683completion_matches(NULL, filename_completion_function);
     
    8188read_history(NULL);
    8289write_history(NULL);
    83 ]])],[ac_cv_have_readline="yes"
    84 ],[ac_cv_have_readline="no"
    85 ]))
     90,
     91ac_cv_have_readline="yes"
     92,
     93ac_cv_have_readline="no"
     94))
    8695      AC_MSG_RESULT($ac_cv_have_readline)
    8796    else
  • omalloc/configure.ac

    r69185ce r0c26a1  
    1111AC_CONFIG_AUX_DIR([../build-aux])
    1212AC_CONFIG_SRCDIR(om_Alloc.c)
    13 AC_CONFIG_HEADERS([_config.h])
     13AC_CONFIG_HEADER([_config.h])
    1414
    1515AC_PROG_CC
     
    155155dnl header file checks
    156156dnl
     157AC_HEADER_STDC
    157158AC_CHECK_HEADERS(limits.h,,
    158159  AC_MSG_ERROR(Can not compile without limits.h))
     
    216217AC_MSG_CHECKING(whether mmap works)
    217218AC_CACHE_VAL(ac_cv_working_mmap,
    218 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     219AC_TRY_RUN([
    219220#include <stdlib.h>
    220221#include "omMmap.c"
     
    225226    exit(1);
    226227  exit(omVfreeMmap(addr, 128*${ac_cv_pagesize}));
    227 }]])],[ac_cv_working_mmap=yes],[ac_cv_working_mmap=no],[ac_cv_working_mmap=no]))
     228}], ac_cv_working_mmap=yes, ac_cv_working_mmap=no, ac_cv_working_mmap=no))
    228229AC_MSG_RESULT($ac_cv_working_mmap)
    229230if test "$ac_cv_working_mmap" = yes; then
     
    236237dnl
    237238AC_CACHE_CHECK(whether alignment needs to be strict, ac_cv_align_need_strict,
    238 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     239AC_TRY_RUN([
    239240#include <stdlib.h>
    240241int main()
     
    248249  else exit(0);
    249250}
    250 ]])],[ac_cv_align_need_strict=no],[ac_cv_align_need_strict=yes],[ac_cv_align_need_strict=yes]))
     251], ac_cv_align_need_strict=no, ac_cv_align_need_strict=yes, ac_cv_align_need_strict=yes))
    251252
    252253dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
     
    310311  AC_MSG_RESULT( (cached) yes)
    311312else
    312 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     313AC_TRY_RUN([
    313314#include <stdlib.h>
    314315#include "$OM_MALLOC_HEADER"
     
    325326  exit(0);
    326327}
    327 ]])],[ac_cv_working_valloc="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}"],[ac_cv_working_valloc=no],[ac_cv_working_valloc=no])
     328], ac_cv_working_valloc="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}", ac_cv_working_valloc=no, ac_cv_working_valloc=no)
    328329if test "${ac_cv_working_valloc}" = no; then
    329330AC_MSG_RESULT(no)
     
    434435AC_MSG_CHECKING(whether GET_RET_ADDR works)
    435436AC_CACHE_VAL(ac_cv_get_return_addr_works,
    436 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     437AC_TRY_RUN([
    437438#include <stdlib.h>
    438439#define OM_GET_RETURN_ADDR_WORKS 1
     
    448449   exit(! test_return_addr());
    449450}
    450 ]])],[ac_cv_get_return_addr_works=yes],[ac_cv_get_return_addr_works=no],[ac_cv_get_return_addr_works=no]))
     451], ac_cv_get_return_addr_works=yes,
     452   ac_cv_get_return_addr_works=no,
     453   ac_cv_get_return_addr_works=no))
    451454AC_MSG_RESULT($ac_cv_get_return_addr_works)
    452455if test "$ac_cv_get_return_addr_works" = yes; then
     
    456459AC_MSG_CHECKING(whether omGetBackTrace works)
    457460AC_CACHE_VAL(ac_cv_get_backtrace_works,
    458 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     461AC_TRY_RUN([
    459462#include <stdio.h>
    460463#include <stdlib.h>
     
    480483   else exit(i+10);
    481484}
    482 ]])],[ac_cv_get_backtrace_works=yes],[ac_cv_get_backtrace_works=no],[ac_cv_get_backtrace_works=no]))
     485], ac_cv_get_backtrace_works=yes,
     486   ac_cv_get_backtrace_works=no,
     487   ac_cv_get_backtrace_works=no))
    483488AC_MSG_RESULT($ac_cv_get_backtrace_works)
    484489if test "$ac_cv_get_backtrace_works" = yes; then
     
    496501AC_MSG_CHECKING(whether addr2line works)
    497502AC_CACHE_VAL(ac_cv_prog_addr2line_works,
    498 AC_RUN_IFELSE([AC_LANG_SOURCE([[
     503AC_TRY_RUN([
    499504#include <stdlib.h>
    500505#define OM_GET_RETURN_ADDR_WORKS 1
     
    524529  else exit (i+10);
    525530}
    526 ]])],[ac_cv_prog_addr2line_works=yes],[ac_cv_prog_addr2line_works=no],[ac_cv_prog_addr2line_works=no]))
     531], ac_cv_prog_addr2line_works=yes,
     532   ac_cv_prog_addr2line_works=no,
     533   ac_cv_prog_addr2line_works=no))
    527534AC_MSG_RESULT($ac_cv_prog_addr2line_works)
    528535
     
    576583
    577584AC_MSG_CHECKING(return type of sbrk)
    578 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define __USE_MISC
     585AC_TRY_LINK(
     586#define __USE_MISC
    579587#include <unistd.h>
    580 ]], [[void *sbrk();
    581 ]])],[AC_DEFINE(Void_t,void,"Type of void")],[AC_DEFINE(Void_t,char,"Type of void")])
     588,
     589void *sbrk();
     590,
     591AC_DEFINE(Void_t,void,"Type of void"),
     592AC_DEFINE(Void_t,char,"Type of void"),
     593)
    582594AC_MSG_RESULT(Void_t)
    583595
  • resources/configure.ac

    r69185ce r0c26a1  
    1 AC_INIT([singular_resources],[4.2.1])
     1AC_INIT([singular_resources], [4.2.1])
    22
    33AC_CONFIG_MACRO_DIR([../m4])
    44AC_CONFIG_AUX_DIR([../build-aux])
    55AC_CONFIG_SRCDIR([omFindExec.h])
    6 AC_CONFIG_HEADERS([_config.h])
     6AC_CONFIG_HEADER([_config.h])
    77
    88AM_MAINTAINER_MODE([enable])
     
    2727AC_PROG_INSTALL
    2828
    29 # Autoupdate added the next two lines to ensure that your configure
    30 # script's behavior did not change.  They are probably safe to remove.
    31 AC_CHECK_INCLUDES_DEFAULT
    32 AC_PROG_EGREP
    33 
     29AC_HEADER_STDC
    3430AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h sys/stat.h sys/types.h])
    3531AC_CHECK_FUNCS(readlink getcwd getwd getpwnam setenv putenv)
  • resources/omFindExec.c

    r69185ce r0c26a1  
    1010
    1111
    12 #if defined(HAVE_UNISTD_H)
     12#if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS)
    1313
    1414#ifdef HAVE_UNISTD_H
     
    317317}
    318318
    319 #endif /* defined(HAVE_UNISTD_H) */
     319#endif /* defined(HAVE_UNISTD_H) && defined(STDC_HEADERS) */
Note: See TracChangeset for help on using the changeset viewer.