hdf5-hdf4link.patch

   1 diff -Nur hdf5-1.4.2-patch1.orig/configure.in hdf5-1.4.2-patch1/configure.in
   2 --- hdf5-1.4.2-patch1.orig/configure.in Fri Jul 20 19:41:09 2001
   3 +++ hdf5-1.4.2-patch1/configure.in      Fri Oct 26 00:27:16 2001
   4 @@ -577,13 +577,16 @@
   5  AC_SUBST(TESTH4TOH5) TESTH4TOH5='$(srcdir)/testh4toh5.sh'
   6
   7  AC_ARG_WITH(hdf4,[  --with-hdf4=INC,LIB     Use the HDF4 library],,withval=no)
   8 +H4LIBS=""
   9  case "$withval" in
  10     yes)
  11 +      save_LIBS="$LIBS"
  12        AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  13 -      AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  14 -      AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  15 -      AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  16 -      AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  17 +      AC_CHECK_LIB(z,compress,H4LIBS="-lz",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  18 +      AC_CHECK_LIB(jpeg,jpeg_start_compress,H4LIBS="$H4LIBS -ljpeg",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  19 +      AC_CHECK_LIB(df,Hstartaccess,H4LIBS="$H4LIBS -ldf",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  20 +      AC_CHECK_LIB(mfhdf,SDstart,H4LIBS="$H4LIBS -lmfhdf",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  21 +      LIBS="$save_LIBS"
  22        ;;
  23     no)
  24        AC_MSG_CHECKING(for HDF4)
  25 @@ -606,18 +609,23 @@
  26        if test -n "$hdf4_lib"; then
  27           saved_LDFLAGS="$LDFLAGS"
  28           LDFLAGS="$LDFLAGS -L$hdf4_lib"
  29 -         AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  30 -         AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  31 -         AC_CHECK_LIB(df,Hstartaccess,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  32 -         AC_CHECK_LIB(mfhdf,SDstart,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  33 +         save_LIBS="$LIBS"
  34 +         AC_CHECK_LIB(z,compress,H4LIBS="-lz",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  35 +         AC_CHECK_LIB(jpeg,jpeg_start_compress,H4LIBS="$H4LIBS -ljpeg",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  36 +         AC_CHECK_LIB(df,Hstartaccess,H4LIBS="$H4LIBS -ldf",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  37 +         AC_CHECK_LIB(mfhdf,SDstart,H4LIBS="$H4LIBS -lmfhdf",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  38 +         LIBS="$save_LIBS"
  39        else
  40 -         AC_CHECK_LIB(z,compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  41 -         AC_CHECK_LIB(jpeg,jpeg_start_compress,,unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  42 -         AC_CHECK_LIB(df,Hstartaccess)
  43 -         AC_CHECK_LIB(mfhdf,SDstart)
  44 +         save_LIBS="$LIBS"
  45 +         AC_CHECK_LIB(z,compress,H4LIBS="-lz",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  46 +         AC_CHECK_LIB(jpeg,jpeg_start_compress,H4LIBS="$H4LIBS -ljpeg",unset H5TOH4 TESTH5TOH4 H4TOH5 H4TOH5TEST TESTH4TOH5)
  47 +         AC_CHECK_LIB(df,Hstartaccess,H4LIBS="$H4LIBS -ldf")
  48 +         AC_CHECK_LIB(mfhdf,SDstart,H4LIBS="$H4LIBS -lmfhdf")
  49 +         LIBS="$save_LIBS"
  50        fi
  51        ;;
  52  esac
  53 +AC_SUBST(H4LIBS)
  54
  55  dnl ----------------------------------------------------------------------
  56  dnl Is the GNU zlib present?  It has a header file `zlib.h' and a library
  57 diff -Nur hdf5-1.4.2-patch1.orig/tools/h4toh5/Makefile.in hdf5-1.4.2-patch1/tools/h4toh5/Makefile.in
  58 --- hdf5-1.4.2-patch1.orig/tools/h4toh5/Makefile.in     Thu Mar 22 01:00:33 2001
  59 +++ hdf5-1.4.2-patch1/tools/h4toh5/Makefile.in  Fri Oct 26 00:20:41 2001
  60 @@ -52,9 +52,9 @@
  61  $(PROGS): $(LIBTOOLS) $(LIBHDF5)
  62
  63  h4toh5test: h4toh5test.lo
  64 -       @$(LT_LINK_EXE) $(CFLAGS) -o $@ h4toh5test.lo $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS)
  65 +       @$(LT_LINK_EXE) $(CFLAGS) -o $@ h4toh5test.lo $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) @H4LIBS@
  66
  67  h4toh5: $(PROG_OBJ)
  68 -       @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(PROG_OBJ) $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS)
  69 +       @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(PROG_OBJ) $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) @H4LIBS@
  70
  71  @CONCLUDE@
  72 diff -Nur hdf5-1.4.2-patch1.orig/tools/h5toh4/Makefile.in hdf5-1.4.2-patch1/tools/h5toh4/Makefile.in
  73 --- hdf5-1.4.2-patch1.orig/tools/h5toh4/Makefile.in     Thu Mar 22 01:00:39 2001
  74 +++ hdf5-1.4.2-patch1/tools/h5toh4/Makefile.in  Fri Oct 26 00:21:13 2001
  75 @@ -55,6 +55,6 @@
  76  $(PROGS): $(LIBTOOLS) $(LIBHDF5)
  77
  78  h5toh4: h5toh4.lo
  79 -       @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.lo $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS)
  80 +       @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.lo $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) @H4LIBS@
  81
  82  @CONCLUDE@