diff --git a/configure b/configure
index f4eb281fc5e2ec3ffca019b5b68a56768c428050..29fccbba5cc9e7dd90dd773aee0a120de92547e0 100755
--- a/configure
+++ b/configure
@@ -5655,14 +5655,6 @@ else
   HDF5="no"
 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
 
@@ -5744,6 +5736,15 @@ 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${FL_ZLIB}" = "xyes"; then
     FLAGS="-DHAVE_LIBZ ${FLAGS}"
diff --git a/configure.in b/configure.in
index b1cca56e42d2899b72b18de204e569ff36e76e54..fd223189cde2011a87c43c05b7eb67ceb63fe36d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-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 Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 dnl
@@ -657,14 +657,6 @@ if test "x${ZLIB}" = "xyes"; then
       LDFLAGS="-L${HDF5_PREFIX}/lib ${LDFLAGS}"
     fi
     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
 
@@ -687,6 +679,16 @@ if test "x${HDF5}" = "xyes"; then
   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)
 if test "x${ZLIB}" = "xyes"; then
   dnl If provided by FLTK, use that one; otherwise, look for it