Hi,
Since the patch removing of the old generated files in patches: 'shared_fortran'
and 'autotools' were too large to add to the bug report. I'm now attaching
the patched versions of these files shared_fortran.new and
autotools.new.
Thanks!
Index: libhdf4-4.2r4/HDF4/configure.ac
===================================================================
--- libhdf4-4.2r4.orig/HDF4/configure.ac 2010-01-14 14:38:42.000000000 +0100
+++ libhdf4-4.2r4/HDF4/configure.ac 2010-01-14 14:40:14.000000000 +0100
@@ -190,12 +190,6 @@
enable_shared="no"
fi
-if test "X${enable_shared}" = "Xyes"; then
- if test "X${BUILD_FORTRAN}" = "Xyes"; then
- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
- fi
-fi
-
AC_PROG_INSTALL
AM_PROG_LEX
AC_PROG_INSTALL
Index: libhdf4-4.2r4/HDF4/hdf/src/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/hdf/src/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/hdf/src/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -4,7 +4,7 @@
include $(top_srcdir)/config/commence.am
-lib_LTLIBRARIES = libdf.la
+lib_LTLIBRARIES = libdfalt.la
FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \
dfr8ff.f dfsdf.c dfsdff.f dfufp2iff.f dfutilf.c herrf.c hfilef.c \
@@ -29,10 +29,10 @@
FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
if HDF_BUILD_FORTRAN
-libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+libdfalt_la_SOURCES = $(CSOURCES) $(FSOURCES)
include_HEADERS = $(CHEADERS) hproto_fortran.h $(FHEADERS)
else
-libdf_la_SOURCES = $(CSOURCES)
+libdfalt_la_SOURCES = $(CSOURCES)
include_HEADERS = $(CHEADERS)
endif
Index: libhdf4-4.2r4/HDF4/hdf/test/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/hdf/test/Makefile.am 2008-10-15 16:08:16.000000000 +0200
+++ libhdf4-4.2r4/HDF4/hdf/test/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -23,11 +23,11 @@
mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
tdupimgs.c testhdf.c tree.c tszip.c tvattr.c tvset.c \
tvsfpack.c vers.c
-testhdf_LDADD = ../src/libdf.la
-testhdf_DEPENDENCIES = testdir ../src/libdf.la
+testhdf_LDADD = ../src/libdfalt.la
+testhdf_DEPENDENCIES = testdir ../src/libdfalt.la
-buffer_LDADD = ../src/libdf.la
-buffer_DEPENDENCIES = ../src/libdf.la
+buffer_LDADD = ../src/libdfalt.la
+buffer_DEPENDENCIES = ../src/libdfalt.la
if HDF_BUILD_FORTRAN
fortest_SOURCES = fortest.c
Index: libhdf4-4.2r4/HDF4/hdf/util/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/hdf/util/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/hdf/util/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -22,76 +22,76 @@
endif
gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
-gif2hdf_LDADD = ../src/libdf.la
-gif2hdf_DEPENDENCIES = ../src/libdf.la
+gif2hdf_LDADD = ../src/libdfalt.la
+gif2hdf_DEPENDENCIES = ../src/libdfalt.la
hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
-hdf2gif_LDADD = ../src/libdf.la
-hdf2gif_DEPENDENCIES = ../src/libdf.la
+hdf2gif_LDADD = ../src/libdfalt.la
+hdf2gif_DEPENDENCIES = ../src/libdfalt.la
hdf2jpeg_SOURCES = hdf2jpeg.c
-hdf2jpeg_LDADD = ../src/libdf.la
-hdf2jpeg_DEPENDENCIES = ../src/libdf.la
+hdf2jpeg_LDADD = ../src/libdfalt.la
+hdf2jpeg_DEPENDENCIES = ../src/libdfalt.la
hdf24to8_SOURCES = hdf24to8.c
-hdf24to8_LDADD = ../src/libdf.la
-hdf24to8_DEPENDENCIES = ../src/libdf.la
+hdf24to8_LDADD = ../src/libdfalt.la
+hdf24to8_DEPENDENCIES = ../src/libdfalt.la
hdf8to24_SOURCES = hdf8to24.c
-hdf8to24_LDADD = ../src/libdf.la
-hdf8to24_DEPENDENCIES = ../src/libdf.la
+hdf8to24_LDADD = ../src/libdfalt.la
+hdf8to24_DEPENDENCIES = ../src/libdfalt.la
hdfcomp_SOURCES = hdfcomp.c
-hdfcomp_LDADD = ../src/libdf.la
-hdfcomp_DEPENDENCIES = ../src/libdf.la
+hdfcomp_LDADD = ../src/libdfalt.la
+hdfcomp_DEPENDENCIES = ../src/libdfalt.la
hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c
-hdfed_LDADD = ../src/libdf.la
-hdfed_DEPENDENCIES = ../src/libdf.la
+hdfed_LDADD = ../src/libdfalt.la
+hdfed_DEPENDENCIES = ../src/libdfalt.la
hdfls_SOURCES = hdfls.c
-hdfls_LDADD = ../src/libdf.la
-hdfls_DEPENDENCIES = ../src/libdf.la
+hdfls_LDADD = ../src/libdfalt.la
+hdfls_DEPENDENCIES = ../src/libdfalt.la
hdfpack_SOURCES = hdfpack.c
-hdfpack_LDADD = ../src/libdf.la
-hdfpack_DEPENDENCIES = ../src/libdf.la
+hdfpack_LDADD = ../src/libdfalt.la
+hdfpack_DEPENDENCIES = ../src/libdfalt.la
hdftopal_SOURCES = hdftopal.c
-hdftopal_LDADD = ../src/libdf.la
-hdftopal_DEPENDENCIES = ../src/libdf.la
+hdftopal_LDADD = ../src/libdfalt.la
+hdftopal_DEPENDENCIES = ../src/libdfalt.la
hdftor8_SOURCES = hdftor8.c
-hdftor8_LDADD = ../src/libdf.la
-hdftor8_DEPENDENCIES = ../src/libdf.la
+hdftor8_LDADD = ../src/libdfalt.la
+hdftor8_DEPENDENCIES = ../src/libdfalt.la
hdfunpac_SOURCES = hdfunpac.c
-hdfunpac_LDADD = ../src/libdf.la
-hdfunpac_DEPENDENCIES = ../src/libdf.la
+hdfunpac_LDADD = ../src/libdfalt.la
+hdfunpac_DEPENDENCIES = ../src/libdfalt.la
jpeg2hdf_SOURCES = jpeg2hdf.c
-jpeg2hdf_LDADD = ../src/libdf.la
-jpeg2hdf_DEPENDENCIES = ../src/libdf.la
+jpeg2hdf_LDADD = ../src/libdfalt.la
+jpeg2hdf_DEPENDENCIES = ../src/libdfalt.la
paltohdf_SOURCES = paltohdf.c
-paltohdf_LDADD = ../src/libdf.la
-paltohdf_DEPENDENCIES = ../src/libdf.la
+paltohdf_LDADD = ../src/libdfalt.la
+paltohdf_DEPENDENCIES = ../src/libdfalt.la
r8tohdf_SOURCES = r8tohdf.c
-r8tohdf_LDADD = ../src/libdf.la
-r8tohdf_DEPENDENCIES = ../src/libdf.la
+r8tohdf_LDADD = ../src/libdfalt.la
+r8tohdf_DEPENDENCIES = ../src/libdfalt.la
ristosds_SOURCES = ristosds.c
-ristosds_LDADD = ../src/libdf.la
-ristosds_DEPENDENCIES = ../src/libdf.la
+ristosds_LDADD = ../src/libdfalt.la
+ristosds_DEPENDENCIES = ../src/libdfalt.la
vmake_SOURCES = vmake.c
-vmake_LDADD = ../src/libdf.la
-vmake_DEPENDENCIES = ../src/libdf.la
+vmake_LDADD = ../src/libdfalt.la
+vmake_DEPENDENCIES = ../src/libdfalt.la
vshow_SOURCES = vshow.c
-vshow_LDADD = ../src/libdf.la
-vshow_DEPENDENCIES = ../src/libdf.la
+vshow_LDADD = ../src/libdfalt.la
+vshow_DEPENDENCIES = ../src/libdfalt.la
#############################################################################
## Testing -- Here there be dragons. ##
Index: libhdf4-4.2r4/HDF4/mfhdf/dumper/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/dumper/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/dumper/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -20,8 +20,8 @@
## Information for building the "hdp" program
hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c \
hdp_util.c hdp_vd.c hdp_vg.c show.c
-hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hdp_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
+hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
#############################################################################
## Testing -- Here there be dragons. ##
Index: libhdf4-4.2r4/HDF4/mfhdf/fortran/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/fortran/Makefile.am 2008-10-15 16:08:16.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/fortran/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -27,22 +27,22 @@
if HDF_BUILD_NETCDF
ftest_SOURCES = ftest.f
ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
- ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+ ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
- $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
endif
hdftest_SOURCES = hdftest.f
-hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hdftest_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
+hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
hdftest1_SOURCES = hdftest1.f
-hdftest1_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-hdftest1_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hdftest1_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
+hdftest1_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
tszip_SOURCES = tszip.f
-tszip_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+tszip_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
+tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
testdir:
-mkdir testdir
Index: libhdf4-4.2r4/HDF4/mfhdf/hdfimport/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/hdfimport/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/hdfimport/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -16,7 +16,7 @@
## Libraries to link against ##
#############################################################################
-LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@
#############################################################################
## Programs to build ##
Index: libhdf4-4.2r4/HDF4/mfhdf/hdiff/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/hdiff/Makefile.am 2008-10-14 23:51:03.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/hdiff/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -22,8 +22,8 @@
hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \
hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
hdiff_table.c hdiff_vs.c hdiff_dim.c
-hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la -lm
-hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hdiff_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la -lm
+hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
#############################################################################
## Testing ##
@@ -34,8 +34,8 @@
noinst_PROGRAMS = hdifftst
hdifftst_SOURCES = hdifftst.c
-hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hdifftst_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
check: hdifftst
@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh
Index: libhdf4-4.2r4/HDF4/mfhdf/hrepack/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/hrepack/Makefile.am 2008-11-18 22:40:10.000000000 +0100
+++ libhdf4-4.2r4/HDF4/mfhdf/hrepack/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -24,8 +24,8 @@
hrepack_opttable.c hrepack_parse.c \
hrepack_sds.c hrepack_utils.c \
hrepack_vg.c hrepack_vs.c hrepack_dim.c
-hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hrepack_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
#############################################################################
## Testing -- Here there be dragons. ##
@@ -46,12 +46,12 @@
../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \
../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \
../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
-test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la -lm
-test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+test_hrepack_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la -lm
+test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
hrepack_check_SOURCES = hrepack_check.c
-hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+hrepack_check_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
#############################################################################
## And the cleanup ##
Index: libhdf4-4.2r4/HDF4/mfhdf/libsrc/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/libsrc/Makefile.am 2009-01-21 03:44:10.000000000 +0100
+++ libhdf4-4.2r4/HDF4/mfhdf/libsrc/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -15,9 +15,9 @@
## Library to build ##
#############################################################################
-lib_LTLIBRARIES = libmfhdf.la
+lib_LTLIBRARIES = libmfhdfalt.la
-## Information for building the "libmfhdf.la" library
+## Information for building the "libmfhdfalt.la" library
CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \
globdef.c mfsd.c nssdc.c putget.c putgetg.c sharray.c string.c \
var.c xdrposix.c
@@ -31,12 +31,12 @@
if HDF_BUILD_FORTRAN
libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
else
-libmfhdf_la_SOURCES = $(CSOURCES)
+libmfhdfalt_la_SOURCES = $(CSOURCES)
endif
if HDF_BUILD_XDR
XDRLIB = ../xdr/libxdr.la
-libmfhdf_la_LIBADD = $(XDRLIB)
+libmfhdfalt_la_LIBADD = $(XDRLIB)
endif
if HDF_BUILD_NETCDF
@@ -63,15 +63,15 @@
check_PROGRAMS = cdftest hdfnctest hdftest
cdftest_SOURCES = cdftest.c
-cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ $(XDRLIB)
+cdftest_LDADD = libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@ $(XDRLIB)
hdfnctest_SOURCES = hdfnctest.c tunlim.c tncunlim.c
-hdfnctest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ $(XDRLIB)
+hdfnctest_LDADD = libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@ $(XDRLIB)
hdftest_SOURCES = hdftest.c tchunk.c tcomp.c tcoordvar.c tdim.c \
temptySDSs.c tfile.c tidtypes.c tnetcdf.c trank0.c \
tsd.c tsdsprops.c tszip.c tdatasizes.c
-hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ $(XDRLIB)
+hdftest_LDADD = libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la @LIBS@ $(XDRLIB)
check:
@echo "============================"
Index: libhdf4-4.2r4/HDF4/mfhdf/ncdump/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/ncdump/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/ncdump/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -21,8 +21,8 @@
## Information for building the "ncdump" program
ncdump_SOURCES = dumplib.c ncdump.c vardata.c
-ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ncdump_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
check: ncdump $(srcdir)/test0.cdl
$(TESTS_ENVIRONMENT) ../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
Index: libhdf4-4.2r4/HDF4/mfhdf/ncgen/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/ncgen/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/ncgen/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -5,9 +5,9 @@
include $(top_srcdir)/config/commence.am
if HDF_BUILD_SHARED
- SHLIBLOC = ../libsrc/.libs/libmfhdf.$(SHARED_EXTENSION) $(top_builddir)/hdf/src/.libs/libdf.$(SHARED_EXTENSION)
+ SHLIBLOC = ../libsrc/.libs/libmfhdfalt.$(SHARED_EXTENSION) $(top_builddir)/hdf/src/.libs/libdfalt.$(SHARED_EXTENSION)
else
- SHLIBLOC = ../libsrc/.libs/libmfhdf.a $(top_builddir)/hdf/src/.libs/libdf.a
+ SHLIBLOC = ../libsrc/.libs/libmfhdfalt.a $(top_builddir)/hdf/src/.libs/libdfalt.a
endif
## Setup the different includes and preprocessor #defines we need.
@@ -37,11 +37,11 @@
## Information for building the "ncgen" program
ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
load.c main.c ncgentab.c
-ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ncgen_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
ctest0_SOURCES=
-ctest0_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+ctest0_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
ftest0_SOURCES=
Index: libhdf4-4.2r4/HDF4/mfhdf/nctest/Makefile.am
===================================================================
--- libhdf4-4.2r4.orig/HDF4/mfhdf/nctest/Makefile.am 2008-10-09 21:45:04.000000000 +0200
+++ libhdf4-4.2r4/HDF4/mfhdf/nctest/Makefile.am 2010-01-14 14:38:42.000000000 +0100
@@ -24,8 +24,8 @@
error.c misctest.c rec.c slabs.c val.c varget_unlim.c \
varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
vputget.c vputgetg.c
-nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
-nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+nctest_LDADD = ../libsrc/libmfhdfalt.la $(top_builddir)/hdf/src/libdfalt.la
+nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdfalt.la ../libsrc/libmfhdfalt.la
#############################################################################
## And the cleanup ##
