Changeset 9de0282 in git


Ignore:
Timestamp:
Apr 2, 2021, 8:46:10 PM (3 years ago)
Author:
Viktor Levandovskyy <levandov@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
b59897f514a46136a5dcdb2c890853eb6b15b04b
Parents:
077d5c0a74afa07094e58e599ce1d2a51b6f6d6da975aaafc9a9168a00b4ca3450c2199a46f13fdd
Message:
Merge branch 'spielwiese' of github.com:levandov/Sources into spielwiese
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/freegb.lib

    ra975aa r9de0282  
    38073807{
    38083808  "EXAMPLE:"; echo = 2;
    3809   LIB "freegb.lib";
    38103809  ring r = 0,(x,y),(c,Dp);
    38113810  ring R = freeAlgebra(r, 7, 2);
    … …  
    38403839{
    38413840  "EXAMPLE:"; echo = 2;
    3842   LIB "freegb.lib";
    38433841  ring r = 0,(x,y),(c,Dp);
    38443842  ring R = freeAlgebra(r, 7, 2);

  • configure.ac

    r077d5c r9de0282  
    9393AC_CHECK_LIB(rt,clock_gettime)
    9494
    95 # Check whether --with-gmp was given.
    96 AC_ARG_WITH([gmp],[AS_HELP_STRING([--with-gmp=path],
    97                     [provide a non-standard location of gmp])])
    98 DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
    99 GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    100 if test "$with_gmp" = yes ; then
    101         GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    102 elif test "$with_gmp" != no ; then
    103         GMP_HOME_PATH="$with_gmp"
    104 fi
    105 
    106 BACKUP_CFLAGS=${CFLAGS}
    107 BACKUP_LIBS=${LIBS}
    108 
    109 for GMP_HOME in ${GMP_HOME_PATH}
    110 do
    111   if test "x$GMP_HOME" != "x/usr"; then
    112     if test -e ${GMP_HOME}/include/gmp.h; then
    113       GMP_CPPFLAGS="-I${GMP_HOME}/include"
    114       GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
    115       break
    116     fi
    117   fi
    118 done
    119 if test -z "${GMP_LIBS}"
    120 then
    121   GMP_LIBS="-lgmp"
    122 fi
    123 
    124 CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
    125 LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
    126 
    127 AC_SUBST(GMP_CPPFLAGS)
    128 AC_SUBST(GMP_LIBS)
    129 
    130 AC_CHECK_HEADERS([gmp.h], ,[AC_MSG_ERROR([GNU MP not found])])
    131 AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
    132 
     95SING_CHECK_GMP
    13396LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    13497LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))

  • factory/configure.ac

    r077d5c r9de0282  
    209209
    210210# Check whether --with-gmp was given.
    211 AC_ARG_WITH([gmp],[AS_HELP_STRING([--with-gmp=path],
    212                     [provide a non-standard location of gmp])])
    213 DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
    214 if test "${with_gmp+set}" = set; then :
    215   if test "$with_gmp" = yes ; then
    216         GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    217    elif test "$with_gmp" != no ; then
    218         GMP_HOME_PATH="$with_gmp"
    219     fi
    220 else
    221   GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    222 fi
    223 
    224 BACKUP_CFLAGS=${CFLAGS}
    225 BACKUP_LIBS=${LIBS}
    226 
    227 for GMP_HOME in ${GMP_HOME_PATH}
    228 do
    229   if test "x$GMP_HOME" != "x/usr"; then
    230     if test -e ${GMP_HOME}/include/gmp.h; then
    231       GMP_CPPFLAGS="-I${GMP_HOME}/include"
    232       GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
    233     fi
    234   else
    235     GMP_CPPFLAGS=""
    236     GMP_LIBS="-lgmp"
    237   fi
    238   CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
    239   LIBS="${BACKUP_LIBS} ${GMP_LIBS}"
    240 done
    241 AC_SUBST(GMP_CPPFLAGS)
    242 AC_SUBST(GMP_LIBS)
    243 
    244 AC_CHECK_HEADERS([gmp.h], ,[AC_MSG_ERROR([GNU MP not found])])
    245 AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
     211SING_CHECK_GMP
    246212
    247213#NTL 9.6.4 requires -lpthread/-pthread

  • libpolys/configure.ac

    r077d5c r9de0282  
    4848
    4949# Check whether --with-gmp was given.
    50 AC_ARG_WITH([gmp],[AS_HELP_STRING([--with-gmp=path],
    51                     [provide a non-standard location of gmp])])
    52 if test "${with_gmp+set}" = set; then :
    53   if test "$with_gmp" = yes ; then
    54         GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    55    elif test "$with_gmp" != no ; then
    56         GMP_HOME_PATH="$with_gmp"
    57     fi
    58 else
    59   GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    60 fi
    61 
    62 BACKUP_CFLAGS=${CFLAGS}
    63 BACKUP_LIBS=${LIBS}
    64 
    65 for GMP_HOME in ${GMP_HOME_PATH}
    66 do
    67   if test "x$GMP_HOME" != "x/usr"; then
    68     if test -e ${GMP_HOME}/include/gmp.h; then
    69       GMP_CPPFLAGS="-I${GMP_HOME}/include"
    70       GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
    71     fi
    72   fi
    73 done
    74 CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
    75 LIBS="${BACKUP_LIBS} ${GMP_LIBS}"
    76 AC_SUBST(GMP_CPPFLAGS)
    77 AC_SUBST(GMP_LIBS)
     50SING_CHECK_GMP
    7851
    7952dnl ntl check in factory

  • m4/ccluster-check.m4

    r077d5c r9de0282  
    33AC_DEFUN([LB_CHECK_CCLUSTER],
    44[
    5 DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
     5DEFAULT_CHECKING_PATH="/opt/homebrew /opt/local /sw /usr/local /usr"
    66
    77AC_ARG_WITH(ccluster,
    … …  
    3535                AC_SUBST(CCLUSTER_LIBS)
    3636                AC_SUBST(CCLUSTER_CPPFLAGS)
    37 
     37                break
    3838        fi
    3939done

  • m4/flint-check.m4

    r077d5c r9de0282  
    1414AC_DEFUN([LB_CHECK_FLINT],
    1515[
    16 DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
     16DEFAULT_CHECKING_PATH="/opt/homebrew /opt/local /sw /usr/local /usr"
    1717
    1818AC_ARG_WITH(flint,
    … …  
    7474                []
    7575                )
     76                if test "x$flint_found" = "xyes" ; then
     77                    break
     78                  fi
    7679                fi
    7780        done

  • m4/gfanlib-check.m4

    r077d5c r9de0282  
    2727
    2828    # Check whether --with-gmp was given.
    29     DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
    30     GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    31     if test "$with_gmp" = yes ; then
    32       GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    33     elif test "$with_gmp" != no ; then
    34       GMP_HOME_PATH="$with_gmp"
    35     fi
    36 
    37     BACKUP_CFLAGS=${CFLAGS}
    38     BACKUP_LIBS=${LIBS}
    39 
    40     for GMP_HOME in ${GMP_HOME_PATH}
    41     do
    42       if test "x$GMP_HOME" != "x/usr"; then
    43         if test -e ${GMP_HOME}/include/gmp.h; then
    44           GMP_CPPFLAGS="-I${GMP_HOME}/include"
    45           GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
    46         fi
    47       fi
    48     done
    49     if test -z "${GMP_LIBS}"
    50     then
    51       GMP_LIBS="-lgmp"
    52     fi
     29    AC_REQUIRE([SING_CHECK_GMP])
    5330
    5431    AC_LANG_PUSH(C++)

  • m4/ntl-check.m4

    r077d5c r9de0282  
    1616AC_DEFUN([LB_CHECK_NTL],
    1717[
    18 DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local /opt/homebrew"
     18DEFAULT_CHECKING_PATH="/opt/homebrew /opt/local /sw /usr/local /usr"
    1919
    2020AC_ARG_WITH(ntl,
    … …  
    9292        [
    9393        ntl_found="no"
    94         ntl_checked="$checked $NTL_HOME"
    9594        unset NTL_CPPFLAGS
    9695        unset NTL_LIBS
    … …  
    135134        [
    136135        ntl_found="no"
    137         ntl_checked="$checked $NTL_HOME"
    138136        unset NTL_CPPFLAGS
    139137        unset NTL_LIBS

  • m4/readline-check.m4

    r077d5c r9de0282  
    33AC_DEFUN([SING_CHECK_READLINE],
    44[
    5 ## DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
    65
    76#AC_ARG_WITH([readline],
Note: See TracChangeset for help on using the changeset viewer.