diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-30 13:18:36 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-30 13:18:36 (GMT) |
| commit | 316c45555ab7c81daf972a3cc03169eea6cd4f04 (patch) | |
| tree | b1105c5f2ead55f93ffc7226f61fc6da5811b2db | |
| parent | aea0549113161c03311c3cc47b19659a1ad04d0d (diff) | |
| download | hdf5-316c45555ab7c81daf972a3cc03169eea6cd4f04.zip hdf5-316c45555ab7c81daf972a3cc03169eea6cd4f04.tar.gz hdf5-316c45555ab7c81daf972a3cc03169eea6cd4f04.tar.bz2 | |
[svn-r24372] back out change to configure until the mercury linking issues are resolved.
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d2f348e..1c92c91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,28 +672,22 @@ IF (HDF5_ENABLE_PARALLEL) OPTION (HDF5_ENABLE_EFF "Enable Exascale Fast-Forward functionalities." OFF) IF (HDF5_ENABLE_EFF) # AXE Asynchronous Engine - FIND_PACKAGE(AXE REQUIRED) + FIND_PACKAGE(AXE) IF (AXE_FOUND) INCLUDE_DIRECTORIES (${AXE_INCLUDE_DIR}) SET (LINK_LIBS ${LINK_LIBS} ${AXE_LIBRARIES}) - ELSE (AXE_FOUND) - MESSAGE (FATAL_ERROR "Could not find AXE, please check AXE_INCLUDE_DIR.") ENDIF (AXE_FOUND) # MERCURY Function Shipper - FIND_PACKAGE(MERCURY NO_MODULE REQUIRED) + FIND_PACKAGE(MERCURY NO_MODULE) IF (MERCURY_FOUND) INCLUDE_DIRECTORIES (${MERCURY_INCLUDE_DIR}) SET (LINK_LIBS ${LINK_LIBS} mercury) - ELSE (MERCURY_FOUND) - MESSAGE (FATAL_ERROR "Could not find MERCURY, please check MERCURY_DIR.") ENDIF (MERCURY_FOUND) # I/O Dispatcher - FIND_PACKAGE(IOD REQUIRED) + FIND_PACKAGE(IOD) IF (IOD_FOUND) INCLUDE_DIRECTORIES (${IOD_INCLUDE_DIR}) SET (LINK_LIBS ${LINK_LIBS} ${IOD_LIBRARIES}) - ELSE (IOD_FOUND) - MESSAGE (FATAL_ERROR "Could not find IOD, please check IOD_INCLUDE_DIR.") ENDIF (IOD_FOUND) # Use threadsafe SET (HDF5_ENABLE_THREADSAFE ON) diff --git a/configure.ac b/configure.ac index 633dbbb..ca4e6d8 100644 --- a/configure.ac +++ b/configure.ac @@ -2773,9 +2773,7 @@ AC_ARG_ENABLE([eff], case "X-$enableval" in X-yes) - # Check mercury (--enable-parallel requires static linking) - PKG_PROG_PKG_CONFIG - PKG_CONFIG="$PKG_CONFIG --static" + # Check mercury PKG_CHECK_MODULES(MERCURY, mercury) AM_CFLAGS="$AM_CFLAGS $MERCURY_CFLAGS" AM_LDFLAGS="$AM_LDFLAGS $MERCURY_LIBS" |