Skip to content

Commit

Permalink
Allow to configure without hwloc
Browse files Browse the repository at this point in the history
This is good for docker builds since older hwloc versions cannot parse
long lines in /proc/mounts (which often occur in docker images).

Belonging to [master]:
  - OpenModelica/OMCompiler#3032
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Apr 3, 2019
1 parent 73c7be8 commit 8676697
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions configure.ac
Expand Up @@ -582,13 +582,17 @@ AC_TRY_LINK([
AC_MSG_RESULT([gettext headers not found])
])

LIBS=""
AC_CHECK_HEADERS(hwloc.h,
[AC_CHECK_LIB(hwloc,hwloc_get_nbobjs_by_depth,
[WITH_HWLOC="1";OMC_LIBS="$OMC_LIBS -lhwloc"],
[WITH_HWLOC="0"])],
[WITH_HWLOC="0"]
)
AC_ARG_WITH(hwloc, [ --without-hwloc (default to looking for it)],[
LIBS=""
AC_CHECK_HEADERS(hwloc.h,
[AC_CHECK_LIB(hwloc,hwloc_get_nbobjs_by_depth,
[WITH_HWLOC="1";OMC_LIBS="$OMC_LIBS -lhwloc"],
[WITH_HWLOC="0"])],
[WITH_HWLOC="0"]
)
],[
WITH_HWLOC="0"
])

LIBS=""
AC_CHECK_HEADERS(uuid/uuid.h,
Expand Down

0 comments on commit 8676697

Please sign in to comment.