Merge pull request #4407 from ggouaillardet/topic/configury_zlib

configury: fix handling of --with-zlib=DIR and --with-zlib-libdir=DIR…

config/opal_setup_zlib.m4

@@ -3,6 +3,8 @@
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,25 +29,29 @@ AC_DEFUN([OPAL_ZLIB_CONFIG],[
     if test "$with_zlib" != "no"; then
         AC_MSG_CHECKING([for zlib in])
         if test ! -z "$with_zlib" && test "$with_zlib" != "yes"; then
+            AC_MSG_RESULT([$with_zlib])
             opal_zlib_dir=$with_zlib
             opal_zlib_standard_header_location=no
-            if test -d $with_zlib/lib; then
+            opal_zlib_standard_lib_location=no
-                opal_zlib_libdir=$with_zlib/lib
+            AS_IF([test -z "$with_zlib_libdir" || test "$with_zlib_libdir" = "yes"],
-            elif test -d $with_zlib/lib64; then
+                  [if test -d $with_zlib/lib; then
-                opal_zlib_libdir=$with_zlib/lib64
+                       opal_zlib_libdir=$with_zlib/lib
-            else
+                   elif test -d $with_zlib/lib64; then
-                AC_MSG_RESULT([Could not find $with_zlib/lib or $with_zlib/lib64])
+                       opal_zlib_libdir=$with_zlib/lib64
-                AC_MSG_ERROR([Can not continue])
+                   else
-            fi
+                       AC_MSG_RESULT([Could not find $with_zlib/lib or $with_zlib/lib64])
-            AC_MSG_RESULT([$opal_zlib_dir and $opal_zlib_libdir])
+                       AC_MSG_ERROR([Can not continue])
+                   fi
+                   AC_MSG_RESULT([$opal_zlib_dir and $opal_zlib_libdir])],
+                  [AC_MSG_RESULT([$with_zlib_libdir])])
         else
             AC_MSG_RESULT([(default search paths)])
             opal_zlib_standard_header_location=yes
+            opal_zlib_standard_lib_location=yes
         fi
         AS_IF([test ! -z "$with_zlib_libdir" && test "$with_zlib_libdir" != "yes"],
               [opal_zlib_libdir="$with_zlib_libdir"
-               opal_zlib_standard_lib_location=no],
+               opal_zlib_standard_lib_location=no])
-              [opal_zlib_standard_lib_location=yes])
 
         OPAL_CHECK_PACKAGE([opal_zlib],
                            [zlib.h],