Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
H5hut
src
Commits
273b1831
Commit
273b1831
authored
Sep 02, 2013
by
gsell
Browse files
fixes to autotool files
parent
83c5a668
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
11 deletions
+17
-11
configure.ac
configure.ac
+15
-9
src/Makefile.am
src/Makefile.am
+1
-1
tools/vtk2h5grid/Makefile.am
tools/vtk2h5grid/Makefile.am
+1
-1
No files found.
configure.ac
View file @
273b1831
AC_INIT([H5hut], [1.99
-trunk
], [h5part@lists.psi.ch], H5hut)
AC_INIT([H5hut], [1.99
.12
], [h5part@lists.psi.ch], H5hut)
AC_PREREQ(2.60)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
...
...
@@ -62,7 +62,7 @@ AC_ARG_WITH(
[hdf5],
[AS_HELP_STRING([--with-hdf5],
[path to HDF5 installation [default=""]])],
[HDF5_PREFIX=$withval], [
HDF5_PREFIX=""
])
[HDF5_PREFIX=$withval], [])
AC_ARG_WITH(
[mpi],
...
...
@@ -284,12 +284,18 @@ fi
###############################################################################
# LIBRARY PATHS
if test -n "${HDF5_PREFIX}" ; then
if test -z "${HDF5_PREFIX}"; then
# alternatives to HDF5_PREFIX
if test -n "${HDF5_DIR}"; then
HDF5_PREFIX=${HDF5_DIR}
fi
fi
if test -n "${HDF5_PREFIX}"; then
CPPFLAGS="$CPPFLAGS -I$HDF5_PREFIX/include"
LDFLAGS="$LDFLAGS -L$HDF5_PREFIX/lib"
fi
AC_CHECK_LIB([z], [compress2])
AC_CHECK_LIB([hdf5], [H5open]
,,, [-lm]
)
AC_CHECK_LIB([hdf5], [H5open])
AS_IF([test "x$ac_cv_lib_hdf5_H5open" != xyes],
[AC_MSG_ERROR([Cannot compile and link a HDF5 program]);
exit 1])
...
...
@@ -336,8 +342,8 @@ fi
###############################################################################
# EXPORTING VARIABLES & CREATING OUTPUT FILES
AM_CPPFLAGS=$CPP
_
FLAGS
AM_LDFLAGS=$LD
_
FLAGS
AM_CPPFLAGS=$CPPFLAGS
AM_LDFLAGS=$LDFLAGS
AC_SUBST(HDF5_PREFIX)
AC_SUBST(CFLAGS)
...
...
@@ -355,13 +361,13 @@ AC_CONFIG_FILES([
src/Fortran/Makefile
test/Makefile
doc/Makefile
tools/Makefile
tools/h5hutcc
tools/vtk2h5grid/Makefile
examples/H5/Makefile
examples/H5Part/Makefile
examples/H5Block/Makefile
examples/H5Fed/Makefile
tools/Makefile
tools/h5hutcc
tools/vtk2h5grid/Makefile
])
AC_OUTPUT
...
...
src/Makefile.am
View file @
273b1831
SUBDIRS
=
h5core C
Fortran
include
SUBDIRS
=
Fortran
h5core C include
tools/vtk2h5grid/Makefile.am
View file @
273b1831
AM_CPPFLAGS
+=
-I
${abs_top_builddir}
/src/include
-Wno-deprecated
FFLAGS
+=
-cpp
$(AM_CPPFLAGS)
AM_LDFLAGS
+=
-L
${abs_top_builddir}
/src/lib
AM_LDFLAGS
+=
-L
${abs_top_builddir}
/src/
h5core/.
lib
s
LDADD
=
-lH5hut
-lvtkIO
-lvtkFiltering
-lvtkCommon
-lvtksys
...
...
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