Skip to content
Snippets Groups Projects
Commit c4531470 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix link order

parent fb6bee2a
No related branches found
No related tags found
No related merge requests found
...@@ -5655,14 +5655,6 @@ else ...@@ -5655,14 +5655,6 @@ else
HDF5="no" HDF5="no"
fi fi
if test "x${HDF5}" = "xyes"; then
if test "x${HDF5_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
FLAGS="${FLAGS} -I${HDF5_PREFIX}/include"
fi
fi
fi fi
fi fi
...@@ -5744,6 +5736,15 @@ fi ...@@ -5744,6 +5736,15 @@ fi
fi fi
fi fi
if test "x${HDF5}" = "xyes"; then
if test "x${HDF5_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
FLAGS="${FLAGS} -I${HDF5_PREFIX}/include"
fi
fi
if test "x${ZLIB}" = "xyes"; then if test "x${ZLIB}" = "xyes"; then
if test "x${FL_ZLIB}" = "xyes"; then if test "x${FL_ZLIB}" = "xyes"; then
FLAGS="-DHAVE_LIBZ ${FLAGS}" FLAGS="-DHAVE_LIBZ ${FLAGS}"
......
dnl $Id: configure.in,v 1.150 2008-02-17 08:47:55 geuzaine Exp $ dnl $Id: configure.in,v 1.151 2008-04-01 21:20:35 geuzaine Exp $
dnl dnl
dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -657,14 +657,6 @@ if test "x${ZLIB}" = "xyes"; then ...@@ -657,14 +657,6 @@ if test "x${ZLIB}" = "xyes"; then
LDFLAGS="-L${HDF5_PREFIX}/lib ${LDFLAGS}" LDFLAGS="-L${HDF5_PREFIX}/lib ${LDFLAGS}"
fi fi
AC_CHECK_LIB(hdf5,main,HDF5="yes",HDF5="no") AC_CHECK_LIB(hdf5,main,HDF5="yes",HDF5="no")
if test "x${HDF5}" = "xyes"; then
if test "x${HDF5_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
FLAGS="${FLAGS} -I${HDF5_PREFIX}/include"
fi
fi
fi fi
fi fi
...@@ -687,6 +679,16 @@ if test "x${HDF5}" = "xyes"; then ...@@ -687,6 +679,16 @@ if test "x${HDF5}" = "xyes"; then
fi fi
fi fi
dnl Complete HDF5 link line (zlib must be linked in after libmed)
if test "x${HDF5}" = "xyes"; then
if test "x${HDF5_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
FLAGS="${FLAGS} -I${HDF5_PREFIX}/include"
fi
fi
dnl Complete zlib link line (zlib must be linked in after libpng and libhdf5) dnl Complete zlib link line (zlib must be linked in after libpng and libhdf5)
if test "x${ZLIB}" = "xyes"; then if test "x${ZLIB}" = "xyes"; then
dnl If provided by FLTK, use that one; otherwise, look for it dnl If provided by FLTK, use that one; otherwise, look for it
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment