Changeset 47c5e6 in git


Ignore:
Timestamp:
Nov 16, 2022, 4:41:28 PM (3 months ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
6a1cdff5edb80f26943821d2616ea6cd684a0a5a
Parents:
fb69c502f926f253f3cdde3646c5e7e142f1a9da
Message:
update some m4/*
Location:
m4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • m4/ax_normalize_path.m4

    rfb69c5 r47c5e6  
    11# ===========================================================================
    2 #     http://www.gnu.org/software/autoconf-archive/ax_normalize_path.html
     2#    https://www.gnu.org/software/autoconf-archive/ax_normalize_path.html
    33# ===========================================================================
    44#
     
    8181#
    8282#   You should have received a copy of the GNU General Public License along
    83 #   with this program. If not, see <http://www.gnu.org/licenses/>.
     83#   with this program. If not, see <https://www.gnu.org/licenses/>.
    8484#
    8585#   As a special exception, the respective Autoconf Macro's copyright owner
     
    9696#   exception to the GPL to apply to your modified version as well.
    9797
    98 #serial 5
     98#serial 8
    9999
    100100AU_ALIAS([ADL_NORMALIZE_PATH], [AX_NORMALIZE_PATH])
     
    107107  :*:) ;;
    108108esac
    109 # squeze repeated slashes
     109# squeeze repeated slashes
    110110case ifelse($2,,"[$]$1",$2) in
    111111# if the path contains any backslashes, turn slashes into backslashes
     
    114114 *) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1/,g'` ;;
    115115esac])
     116
  • m4/ax_prog_cc_for_build.m4

    rfb69c5 r47c5e6  
    3333#   warranty.
    3434
    35 #serial 18
     35#serial 21
    3636
    3737AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
     
    4545pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
    4646pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
     47pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
     48pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl
    4749pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
    4850pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
     
    8486
    8587AC_LANG_PUSH([C])
     88
     89dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover
     90dnl the use of this variable in _AC_LANG_COMPILER_GNU called by
     91dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround.
     92was_set_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y}
     93AS_IF([test ${was_set_c_compiler_gnu}],
     94    [saved_c_compiler_gnu=$[ac_cv_c_compiler_gnu]
     95    AS_UNSET([[ac_cv_c_compiler_gnu]])])
     96
    8697AC_PROG_CC
     98
     99dnl Restore ac_cv_c_compiler_gnu
     100AS_IF([test ${was_set_c_compiler_gnu}],
     101  [[ac_cv_c_compiler_gnu]=$[saved_c_compiler_gnu]])
     102
    87103_AC_COMPILER_EXEEXT
    88104_AC_COMPILER_OBJEXT
     
    138154AC_SUBST([LDFLAGS_FOR_BUILD])dnl
    139155])
     156
  • m4/flint-check.m4

    rfb69c5 r47c5e6  
    2323                            Otherwise you can give the <path> to the directory
    2424                            which contains the library.
    25              ],
    26              [if test "x$withval" = xyes ; then
    27                         FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
    28               elif test "x$withval" != xno ; then
    29                         FLINT_HOME_PATH="$withval"
    30              fi],
    31              [FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
     25             ],
     26             [if test "x$withval" = xyes ; then
     27                        FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
     28              elif test "x$withval" != xno ; then
     29                        FLINT_HOME_PATH="$withval"
     30             fi],
     31             [FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
    3232
    3333dnl Check for existence
     
    4545                FLINT_LIBS="-lflint -lmpfr -lgmp"
    4646        else
    47                 FLINT_CFLAGS="-I${FLINT_HOME}/include/"
    48                 FLINT_LIBS="-L${FLINT_HOME}/lib -Wl,-rpath,${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
     47                FLINT_CFLAGS="-I${FLINT_HOME}/include/"
     48                FLINT_LIBS="-L${FLINT_HOME}/lib -Wl,-rpath,${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
    4949        fi
    5050
    51         # we suppose that mpfr and mpir to be in the same place or available by default
    52                 CFLAGS="${FLINT_CFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
    53                 LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
     51        # we suppose that mpfr and mpir to be in the same place or available by default
     52                CFLAGS="${FLINT_CFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
     53                LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
    5454
    55                 AC_TRY_LINK([#include <flint/fmpz.h>
    56                             ],
    57                             [fmpz_t x; fmpz_init(x);], [
    58                         flint_found="yes"
    59                         break
    60                 ])
     55                AC_LINK_IFELSE(
     56                [AC_LANG_PROGRAM([[#include <flint/fmpz.h>]],
     57                            [[fmpz_t x; fmpz_init(x);]])],
     58                        [flint_found="yes"],
     59                        [break])
    6160done
    6261
     
    7069
    7170if test "x$flint_found" = "xyes" ; then
    72         AC_DEFINE(HAVE_FLINT,1,[Define if FLINT is installed])
    73         HAVE_FLINT=yes
    74         AC_MSG_RESULT(found)
     71        AC_DEFINE(HAVE_FLINT,1,[Define if FLINT is installed])
     72        HAVE_FLINT=yes
     73        AC_MSG_RESULT(found)
    7574else
    76         AC_MSG_RESULT(not found)
    77         FLINT_CFLAGS=""
    78         FLINT_LIBS=""
    79         FLINT_HOME=""
     75        AC_MSG_RESULT(not found)
     76        FLINT_CFLAGS=""
     77        FLINT_LIBS=""
     78        FLINT_HOME=""
    8079fi
    8180AC_SUBST(FLINT_CFLAGS)
  • m4/gmp-check.m4

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

    rfb69c5 r47c5e6  
    2323    ac_google_perfdir='no'
    2424    AC_ARG_WITH(google-perftools,
    25         AC_HELP_STRING([--with-google-perftools=DIR],
     25        AS_HELP_STRING([--with-google-perftools=DIR],
    2626            [location of a google perftools installation (default none)]),
    2727        ac_google_perfdir=$withval)
    2828
    2929    AC_ARG_ENABLE(google-profiling,
    30                   AC_HELP_STRING([--enable-google-profiling],
     30                  AS_HELP_STRING([--enable-google-profiling],
    3131                  [compile with google profiling]),
    3232                  [google_profile=$enableval],
Note: See TracChangeset for help on using the changeset viewer.