update pwre_configure.sh for pwr56 (hdf5 + dmq)

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -339,21 +339,21 @@ declare -i lockdbs=0
 if [ "$1" = "--help" ]; then
     pwre_help
     exit
-elif [ "$1" = "--version" ] && [ "$2" != "" ] && [ "$3" != "" ]; then
+    elif [ "$1" = "--version" ] && [ "$2" != "" ] && [ "$3" != "" ]; then
     buildversion=$2" "$3
     buildversion_set=1
-elif [ "$1" = "--reset-version" ]; then
+    elif [ "$1" = "--reset-version" ]; then
     buildversion=""
     buildversion_set=1
-elif [ "$1" = "--lock-dbs" ]; then
+    elif [ "$1" = "--lock-dbs" ]; then
     lockdbs=1
     lockdbs_set=1
-elif [ "$1" = "--unlock-dbs" ]; then
+    elif [ "$1" = "--unlock-dbs" ]; then
     lockdbs=0
     lockdbs_set=1
-elif [ "$1" = "--ebuild" ]; then
+    elif [ "$1" = "--ebuild" ]; then
     ebuild=1
-elif [ "$1" != "" ]; then
+    elif [ "$1" != "" ]; then
     echo "Unknown option \"$1\""
     exit
 fi
@@ -502,10 +502,12 @@ else
     pwre_config_check_lib mysql     MYSQL    lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-$gnu/libmysqlclient.so"
     pwre_config_check_include sqlite3 SQLITE3   1 "/usr/include/sqlite3.h"
     pwre_config_check_lib libsqlite3   LIBSQLITE3  lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so"
-  pwre_config_check_include hdf5  HDF5   1 "/usr/lib/openmpi/include/mpi.h.no"
-  pwre_config_check_lib libhdf5   LIBHDF5  lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so"
+    pwre_config_check_include hdf5  HDF5   1 "/usr/lib/openmpi/include/mpi.h:/usr/lib/$hwpl-linux-$gnu/openmpi/include/mpi.h"
+    pwre_config_check_include hdf5  HDF5   1 "/usr/include/hdf5/openmpi/hdf5.h:/usr/lib/$hwpl-linux-$gnu/hdf5/openmpi/include/hdf5.h"
+    pwre_config_check_lib libhdf5   LIBHDF5  lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so:/usr/lib/$hwpl-linux-$gnu/libmpi.so.20"
+    pwre_config_check_lib libhdf5   LIBHDF5  lib lib 0 "/usr/lib/$hwpl-linux-$gnu/libmpi.so.20"
     pwre_config_check_lib rabbitmq  RABBITMQ lib rabbitmq  1 "/usr/lib/$hwpl-linux-$gnu/librabbitmq.so"
-  pwre_config_check_lib mq        MQ       lib mq  1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
+    pwre_config_check_lib mq        MQ       lib mq  1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so:/usr/local/lib/libdmq.so"
     pwre_config_check_lib wmq       WMQ      lib wmq 1 "/usr/lib/libmqic.so"
     pwre_config_check_lib libprofinet PNAK     lib pnak 1 "/usr/lib/libprofinet.a"
     pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-$gnu/libusb-1.0.so"
@@ -520,7 +522,7 @@ else
         pwre_config_check_include piface  PIFACE  1 "/usr/local/include/libpiface-1.0/pfio.h"
     fi
     
-  pwre_config_check_include mq    MQ    0 "/usr/local/dmq/include/p_entry.h"
+    pwre_config_check_include mq    MQ    0 "/usr/local/dmq/include/p_entry.h:/usr/local/include/p_entry.h"
     pwre_config_check_include wmq   WMQ   1 "/opt/mqm/inc/cmqc.h"
     pwre_config_check_include cifx  CIFX  1 "/usr/local/include/cifx/cifxlinux.h"
     pwre_config_check_include nodave NODAVE 1 "/usr/include/nodave.h"