Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
darshan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
72
Issues
72
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
darshan
darshan
Commits
4bc44022
Commit
4bc44022
authored
Apr 27, 2017
by
Shane Snyder
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gkl/fix-bz2-ac' into 'master'
fix --with-bzlib=DIR ignoring DIR See merge request !13
parents
d24220d0
d19e0e47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
darshan-util/configure
darshan-util/configure
+6
-6
maint/config/check_bzlib.m4
maint/config/check_bzlib.m4
+6
-6
No files found.
darshan-util/configure
View file @
4bc44022
...
...
@@ -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
View file @
4bc44022
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment