[Darshan-commits] [Git][darshan/darshan][master] 2 commits: fix --with-bzlib=DIR ignoring DIR

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
d19e0e47 by Glenn K. Lockwood at 2017-04-26T14:39:09-07:00
fix --with-bzlib=DIR ignoring DIR

- - - - -
4bc44022 by Shane Snyder at 2017-04-27T17:50:27-05:00
Merge branch 'gkl/fix-bz2-ac' into 'master'

fix --with-bzlib=DIR ignoring DIR

See merge request !13
- - - - -


2 changed files:

- darshan-util/configure
- maint/config/check_bzlib.m4


Changes:

=====================================
darshan-util/configure
=====================================
--- a/darshan-util/configure
+++ b/darshan-util/configure
@@ -3525,6 +3525,7 @@ if test "${with_bzlib+set}" = set; then :
   then
     BZLIB_HOME="$withval"
   else
+    BZLIB_HOME=/usr/local
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $withval does not exist, checking usual places" >&5
 $as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
   fi
@@ -3536,17 +3537,16 @@ fi
 fi
 
 
-BZLIB_HOME=/usr/local
-if test ! -f "${BZLIB_HOME}/include/bzlib.h"
-then
-        BZLIB_HOME=/usr
-fi
-
 #
 # Locate bzlib, if wanted
 #
 if test -z "${DISABLE_BZLIB}"
 then
+        if test ! -f "${BZLIB_HOME}/include/bzlib.h"
+        then
+            BZLIB_HOME=/usr
+        fi
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
         BZLIB_OLD_LDFLAGS=$LDFLAGS


=====================================
maint/config/check_bzlib.m4
=====================================
--- a/maint/config/check_bzlib.m4
+++ b/maint/config/check_bzlib.m4
@@ -37,6 +37,7 @@ AC_ARG_WITH(bzlib,
   then
     BZLIB_HOME="$withval"
   else
+    BZLIB_HOME=/usr/local
     AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
   fi
 else
@@ -44,17 +45,16 @@ else
   AC_MSG_RESULT(no)
 fi])
 
-BZLIB_HOME=/usr/local
-if test ! -f "${BZLIB_HOME}/include/bzlib.h"
-then
-        BZLIB_HOME=/usr
-fi
-
 #
 # Locate bzlib, if wanted
 #
 if test -z "${DISABLE_BZLIB}" 
 then
+        if test ! -f "${BZLIB_HOME}/include/bzlib.h"
+        then
+            BZLIB_HOME=/usr
+        fi
+
         AC_MSG_RESULT(yes)
         BZLIB_OLD_LDFLAGS=$LDFLAGS
         BZLIB_OLD_CPPFLAGS=$CPPFLAGS



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/d24220d067aa2c5e8061daacc60630a7f86ffcdc...4bc44022dabf1df133da150ea0019330912099ad