Skip to content

Commit

Permalink
BUILD: update autoconf (openucx#712)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergei-Lebedev authored Jan 20, 2023
1 parent a9a5f56 commit 92fa603
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions config/m4/compiler.m4
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ AC_DEFUN([CHECK_SPECIFIC_ATTRIBUTE], [
#
# Try to compile using the C compiler
#
AC_TRY_COMPILE([$3],[],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]],[[]])],
[ucx_cv_attribute_[$1]=1],
[ucx_cv_attribute_[$1]=0])
CFLAGS="$SAVE_CFLAGS"
Expand All @@ -73,7 +73,7 @@ AC_DEFUN([CHECK_SPECIFIC_ATTRIBUTE], [
# Enable/disable turning on machine-specific optimizations
#
AC_ARG_ENABLE(optimizations,
AC_HELP_STRING([--enable-optimizations],
AS_HELP_STRING([--enable-optimizations],
[Enable non-portable machine-specific CPU optimizations, default: NO]),
[],
[enable_optimizations=no])
Expand All @@ -88,7 +88,7 @@ AC_ARG_ENABLE(optimizations,
AC_DEFUN([COMPILER_CPU_OPTIMIZATION],
[
AC_ARG_WITH([$1],
[AC_HELP_STRING([--with-$1], [Use $2 compiler option.])],
[AS_HELP_STRING([--with-$1], [Use $2 compiler option.])],
[],
[with_$1=$enable_optimizations])
Expand Down
6 changes: 3 additions & 3 deletions config/m4/sysdep.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AC_CHECK_LIB([rt], [timer_create], [], AC_MSG_ERROR([librt not found]))
#
AC_CHECK_HEADERS([libgen.h])
AC_CHECK_DECLS([asprintf, basename, fmemopen], [],
AC_MSG_ERROR([GNU string extensions not found]),
AC_MSG_ERROR([GNU string extensions not found]),
[#define _GNU_SOURCE 1
#include <string.h>
#include <stdio.h>
Expand All @@ -36,14 +36,14 @@ AC_CHECK_DECLS([asprintf, basename, fmemopen], [],
# Valgrind support
#
AC_ARG_WITH([valgrind],
AC_HELP_STRING([--with-valgrind],
AS_HELP_STRING([--with-valgrind],
[Enable Valgrind annotations (small runtime overhead, default NO)]),
[],
[with_valgrind=no]
)
AS_IF([test "x$with_valgrind" = xno],
[AC_DEFINE([NVALGRIND], 1, [Define to 1 to disable Valgrind annotations.])],
[AS_IF([test ! -d $with_valgrind],
[AS_IF([test ! -d $with_valgrind],
[AC_MSG_NOTICE([Valgrind path was not defined, guessing ...])
with_valgrind=/usr], [:])
AC_CHECK_HEADER([$with_valgrind/include/valgrind/memcheck.h], [],
Expand Down
7 changes: 3 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2001-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright (c) 2001-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# This software product is a proprietary product of Mellanox Technologies Ltd.
# (the "Company") and all right, title, and interest and to the software product,
# including all associated intellectual property rights, are and shall
Expand All @@ -10,6 +10,7 @@
# $COPYRIGHT$
# $HEADER$

AC_PREREQ([2.63])
define([ucc_ver_major], 1)
define([ucc_ver_minor], 2)
define([ucc_ver_patch], 0)
Expand All @@ -27,7 +28,6 @@ AC_INIT([ucc], [ucc_ver_major.ucc_ver_minor])
: ${CXXFLAGS=""}

AC_USE_SYSTEM_EXTENSIONS
AC_GNU_SOURCE
AC_CONFIG_HEADERS([config.h])

UCC_TOP_BUILDDIR="`pwd`"
Expand Down Expand Up @@ -73,8 +73,7 @@ AM_PROG_AS
AC_PROG_LN_S
AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_HEADER_STDC
LT_INIT
CFLAGS="$CFLAGS_save"

AC_CHECK_SIZEOF(float)
Expand Down

0 comments on commit 92fa603

Please sign in to comment.