Skip to content

Commit

Permalink
Merge pull request #25 from davidozog/pr/fix_missing_libs
Browse files Browse the repository at this point in the history
configury: support SHMEM compiler names in AC_PROG_CC/CXX/FC macros
  • Loading branch information
davidozog authored Apr 29, 2022
2 parents 3480dae + 9900230 commit 2e4e2de
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ AS_IF([test -z "$AM_V"],
AC_SUBST([AM_V])
AC_SUBST([AM_DEFAULT_V])])

dnl check for programs
AC_PROG_CC([oshcc])
AM_PROG_CC_C_O
AC_C_INLINE
AC_PROG_CXX([oshc++]) dnl required even with --disable-cxx due to automake conditionals

dnl information on the package
AC_ARG_ENABLE([picky],
[AC_HELP_STRING([--enable-picky],
Expand Down Expand Up @@ -100,14 +106,8 @@ AC_ARG_ENABLE([shmemx],
[Enable SHMEM extensions tests (default:disabled)])])
AM_CONDITIONAL([SHMEMX_TESTS], [test "$enable_shmemx" = "yes"])

dnl check for programs
AC_PROG_CC
AM_PROG_CC_C_O
AC_C_INLINE
AC_PROG_CXX dnl required even with --disable-cxx due to automake conditionals

if test "$enable_fortran" != "no" ; then
AC_PROG_FC
AC_PROG_FC([oshfort])
else
FC=
fi
Expand Down Expand Up @@ -211,6 +211,8 @@ if test "$enable_debug" = "yes" ; then
CFLAGS="$CFLAGS -g"
fi

AC_SEARCH_LIBS([ceil], [m], [], AC_MSG_ERROR([unable to find ceil() function]))

AM_CONDITIONAL([HAVE_FORTRAN], [test "$FC" != ""])
AM_CONDITIONAL([HAVE_CXX], [test "$enable_cxx" != "no" ])
AM_CONDITIONAL([ENABLE_PROFILING], [test "$enable_profiling" = "yes" ])
Expand Down

0 comments on commit 2e4e2de

Please sign in to comment.