BUG #75415 + stable on amd64.

(Portage version: 2.0.51-r14)

1 files changed, 409 insertions, 0 deletions

diff --git a/sci-libs/hdf/files/hdf-4.2.0-shared-libs.patch b/sci-libs/hdf/files/hdf-4.2.0-shared-libs.patch
new file mode 100644
index 000000000000..357e99fcb558
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.0-shared-libs.patch
@@ -0,0 +1,409 @@
+diff -ru hdf4.2r0.orig/configure.ac hdf4.2r0/configure.ac
+--- hdf4.2r0.orig/configure.ac	2003-11-21 21:06:01.000000000 +0100
++++ hdf4.2r0/configure.ac	2005-01-24 16:00:40.349448064 +0100
+@@ -166,7 +166,7 @@
+ AC_PROG_INSTALL
+ AM_PROG_LEX
+ AC_PROG_LN_S
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_YACC
+ 
+ AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+Only in hdf4.2r0/: configure.ac.orig
+diff -ru hdf4.2r0.orig/hdf/src/Makefile.am hdf4.2r0/hdf/src/Makefile.am
+--- hdf4.2r0.orig/hdf/src/Makefile.am	2003-11-07 00:04:16.000000000 +0100
++++ hdf4.2r0/hdf/src/Makefile.am	2005-01-24 15:59:49.534173160 +0100
+@@ -2,7 +2,7 @@
+ ##                          Library to build                               ##
+ #############################################################################
+ 
+-lib_LIBRARIES = libdf.a
++lib_LTLIBRARIES = libdf.la
+ 
+ FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c    \
+            dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c  \
+@@ -26,10 +26,10 @@
+ FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
+ 
+ if HDF_BUILD_FORTRAN
+-libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
++libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+ include_HEADERS = $(CHEADERS) $(FHEADERS)
+ else
+-libdf_a_SOURCES = $(CSOURCES)
++libdf_la_SOURCES = $(CSOURCES)
+ include_HEADERS = $(CHEADERS)
+ endif
+ 
+diff -ru hdf4.2r0.orig/hdf/util/Makefile.am hdf4.2r0/hdf/util/Makefile.am
+--- hdf4.2r0.orig/hdf/util/Makefile.am	2003-11-07 19:38:46.000000000 +0100
++++ hdf4.2r0/hdf/util/Makefile.am	2005-01-24 16:02:06.862296112 +0100
+@@ -20,76 +20,76 @@
+ endif
+ 
+ gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
+-gif2hdf_LDADD = ../src/libdf.a
+-gif2hdf_DEPENDENCIES = ../src/libdf.a
++gif2hdf_LDADD = ../src/libdf.la
++gif2hdf_DEPENDENCIES = ../src/libdf.la
+ 
+ hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
+-hdf2gif_LDADD = ../src/libdf.a
+-hdf2gif_DEPENDENCIES = ../src/libdf.a
++hdf2gif_LDADD = ../src/libdf.la
++hdf2gif_DEPENDENCIES = ../src/libdf.la
+ 
+ hdf2jpeg_SOURCES = hdf2jpeg.c
+-hdf2jpeg_LDADD = ../src/libdf.a
+-hdf2jpeg_DEPENDENCIES = ../src/libdf.a
++hdf2jpeg_LDADD = ../src/libdf.la
++hdf2jpeg_DEPENDENCIES = ../src/libdf.la
+ 
+ hdf24to8_SOURCES = hdf24to8.c
+-hdf24to8_LDADD = ../src/libdf.a
+-hdf24to8_DEPENDENCIES = ../src/libdf.a
++hdf24to8_LDADD = ../src/libdf.la
++hdf24to8_DEPENDENCIES = ../src/libdf.la
+ 
+ hdf8to24_SOURCES = hdf8to24.c
+-hdf8to24_LDADD = ../src/libdf.a
+-hdf8to24_DEPENDENCIES = ../src/libdf.a
++hdf8to24_LDADD = ../src/libdf.la
++hdf8to24_DEPENDENCIES = ../src/libdf.la
+ 
+ hdfcomp_SOURCES = hdfcomp.c
+-hdfcomp_LDADD = ../src/libdf.a
+-hdfcomp_DEPENDENCIES = ../src/libdf.a
++hdfcomp_LDADD = ../src/libdf.la
++hdfcomp_DEPENDENCIES = ../src/libdf.la
+ 
+ hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c
+-hdfed_LDADD = ../src/libdf.a
+-hdfed_DEPENDENCIES = ../src/libdf.a
++hdfed_LDADD = ../src/libdf.la
++hdfed_DEPENDENCIES = ../src/libdf.la
+ 
+ hdfls_SOURCES = hdfls.c
+-hdfls_LDADD = ../src/libdf.a
+-hdfls_DEPENDENCIES = ../src/libdf.a
++hdfls_LDADD = ../src/libdf.la
++hdfls_DEPENDENCIES = ../src/libdf.la
+ 
+ hdfpack_SOURCES = hdfpack.c
+-hdfpack_LDADD = ../src/libdf.a
+-hdfpack_DEPENDENCIES = ../src/libdf.a
++hdfpack_LDADD = ../src/libdf.la
++hdfpack_DEPENDENCIES = ../src/libdf.la
+ 
+ hdftopal_SOURCES = hdftopal.c
+-hdftopal_LDADD = ../src/libdf.a
+-hdftopal_DEPENDENCIES = ../src/libdf.a
++hdftopal_LDADD = ../src/libdf.la
++hdftopal_DEPENDENCIES = ../src/libdf.la
+ 
+ hdftor8_SOURCES = hdftor8.c
+-hdftor8_LDADD = ../src/libdf.a
+-hdftor8_DEPENDENCIES = ../src/libdf.a
++hdftor8_LDADD = ../src/libdf.la
++hdftor8_DEPENDENCIES = ../src/libdf.la
+ 
+ hdfunpac_SOURCES = hdfunpac.c
+-hdfunpac_LDADD = ../src/libdf.a
+-hdfunpac_DEPENDENCIES = ../src/libdf.a
++hdfunpac_LDADD = ../src/libdf.la
++hdfunpac_DEPENDENCIES = ../src/libdf.la
+ 
+ jpeg2hdf_SOURCES = jpeg2hdf.c
+-jpeg2hdf_LDADD = ../src/libdf.a
+-jpeg2hdf_DEPENDENCIES = ../src/libdf.a
++jpeg2hdf_LDADD = ../src/libdf.la
++jpeg2hdf_DEPENDENCIES = ../src/libdf.la
+ 
+ paltohdf_SOURCES = paltohdf.c
+-paltohdf_LDADD = ../src/libdf.a
+-paltohdf_DEPENDENCIES = ../src/libdf.a
++paltohdf_LDADD = ../src/libdf.la
++paltohdf_DEPENDENCIES = ../src/libdf.la
+ 
+ r8tohdf_SOURCES = r8tohdf.c
+-r8tohdf_LDADD = ../src/libdf.a
+-r8tohdf_DEPENDENCIES = ../src/libdf.a
++r8tohdf_LDADD = ../src/libdf.la
++r8tohdf_DEPENDENCIES = ../src/libdf.la
+ 
+ ristosds_SOURCES = ristosds.c
+-ristosds_LDADD = ../src/libdf.a
+-ristosds_DEPENDENCIES = ../src/libdf.a
++ristosds_LDADD = ../src/libdf.la
++ristosds_DEPENDENCIES = ../src/libdf.la
+ 
+ vmake_SOURCES = vmake.c
+-vmake_LDADD = ../src/libdf.a
+-vmake_DEPENDENCIES = ../src/libdf.a
++vmake_LDADD = ../src/libdf.la
++vmake_DEPENDENCIES = ../src/libdf.la
+ 
+ vshow_SOURCES = vshow.c
+-vshow_LDADD = ../src/libdf.a
+-vshow_DEPENDENCIES = ../src/libdf.a
++vshow_LDADD = ../src/libdf.la
++vshow_DEPENDENCIES = ../src/libdf.la
+ 
+ #############################################################################
+ ##                   Testing -- Here there be dragons.                     ##
+diff -ru hdf4.2r0.orig/mfhdf/libsrc/Makefile.am hdf4.2r0/mfhdf/libsrc/Makefile.am
+--- hdf4.2r0.orig/mfhdf/libsrc/Makefile.am	2003-11-07 00:07:00.000000000 +0100
++++ hdf4.2r0/mfhdf/libsrc/Makefile.am	2005-01-24 15:59:49.535173008 +0100
+@@ -13,7 +13,7 @@
+ ##                          Library to build                               ##
+ #############################################################################
+ 
+-lib_LIBRARIES = libmfhdf.a
++lib_LTLIBRARIES = libmfhdf.la
+ 
+ ## Information for building the "libmfhdf.a" library
+ CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c    \
+@@ -25,17 +25,17 @@
+ if HDF_BUILD_FORTRAN
+ 
+ if HDF_BUILD_XDR
+-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
++libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
+ else
+-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
++libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+ endif
+ 
+ else
+ 
+ if HDF_BUILD_XDR
+-libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)
++libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
+ else
+-libmfhdf_a_SOURCES = $(CSOURCES)
++libmfhdf_la_SOURCES = $(CSOURCES)
+ endif
+ 
+ endif
+diff -ru hdf4.2r0.orig/mfhdf/port/Makefile.am hdf4.2r0/mfhdf/port/Makefile.am
+--- hdf4.2r0.orig/mfhdf/port/Makefile.am	2003-08-09 03:58:54.000000000 +0200
++++ hdf4.2r0/mfhdf/port/Makefile.am	2005-01-24 15:59:49.536172856 +0100
+@@ -1,2 +1,2 @@
+-lib_LIBRARIES = libudport.a
+-libudport_a_SOURCES = uddummy.c
++lib_LTLIBRARIES = libudport.la
++libudport_la_SOURCES = uddummy.c
+diff -ru hdf4.2r0.orig/hdf/test/Makefile.am hdf4.2r0/hdf/test/Makefile.am
+--- hdf4.2r0.orig/hdf/test/Makefile.am	2003-11-07 19:38:42.000000000 +0100
++++ hdf4.2r0/hdf/test/Makefile.am	2005-01-24 16:38:54.077748360 +0100
+@@ -21,20 +21,20 @@
+                   mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c  \
+                   testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c      \
+                   vers.c
+-testhdf_LDADD = ../src/libdf.a
+-testhdf_DEPENDENCIES = testdir ../src/libdf.a
++testhdf_LDADD = ../src/libdf.la
++testhdf_DEPENDENCIES = testdir ../src/libdf.la
+ 
+ if HDF_BUILD_FORTRAN
+ fortest_SOURCES = fortest.c
+-fortest_LDADD = ../src/libdf.a
+-fortest_DEPENDENCIES = testdir fortestF ../src/libdf.a
++fortest_LDADD = ../src/libdf.la
++fortest_DEPENDENCIES = testdir fortestF ../src/libdf.la
+ 
+ fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f   \
+                    t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f          \
+                    tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f        \
+                    tvattrf.f tvsetf.f
+-fortestF_LDADD = ../src/libdf.a
+-fortestF_DEPENDENCIES = testdir ../src/libdf.a
++fortestF_LDADD = ../src/libdf.la
++fortestF_DEPENDENCIES = testdir ../src/libdf.la
+ endif
+ 
+ testdir:
+diff -ru hdf4.2r0.orig/mfhdf/dumper/Makefile.am hdf4.2r0/mfhdf/dumper/Makefile.am
+--- hdf4.2r0.orig/mfhdf/dumper/Makefile.am	2003-11-07 19:38:49.000000000 +0100
++++ hdf4.2r0/mfhdf/dumper/Makefile.am	2005-01-24 16:38:54.085747144 +0100
+@@ -18,8 +18,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.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ #############################################################################
+ ##                   Testing -- Here there be dragons.                     ##
+diff -ru hdf4.2r0.orig/mfhdf/fortran/Makefile.am hdf4.2r0/mfhdf/fortran/Makefile.am
+--- hdf4.2r0.orig/mfhdf/fortran/Makefile.am	2003-11-24 23:11:25.000000000 +0100
++++ hdf4.2r0/mfhdf/fortran/Makefile.am	2005-01-24 16:38:54.087746840 +0100
+@@ -19,13 +19,13 @@
+ 
+ ftest_SOURCES = ftest.f
+ ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
+-              ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
++              ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+ ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
+-                     $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++                     $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ hdftest_SOURCES = hdftest.f
+-hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ testdir:
+ 	-mkdir testdir
+diff -ru hdf4.2r0.orig/mfhdf/hdfimport/Makefile.am hdf4.2r0/mfhdf/hdfimport/Makefile.am
+--- hdf4.2r0.orig/mfhdf/hdfimport/Makefile.am	2003-11-07 19:38:54.000000000 +0100
++++ hdf4.2r0/mfhdf/hdfimport/Makefile.am	2005-01-24 16:38:54.089746536 +0100
+@@ -17,8 +17,8 @@
+ bin_PROGRAMS = hdfimport
+ 
+ hdfimport_SOURCES = hdfimport.c
+-hdfimport_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdfimport_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ #############################################################################
+ ##                   Testing -- Here there be dragons.                     ##
+@@ -28,8 +28,8 @@
+ check_SCRIPTS = testutil.sh
+ 
+ hdfimporttest_SOURCES = hdfimporttest.c
+-hdfimporttest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdfimporttest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ check: hdfimporttest
+ 	@$(SHELL) ./testutil.sh
+diff -ru hdf4.2r0.orig/mfhdf/hdiff/Makefile.am hdf4.2r0/mfhdf/hdiff/Makefile.am
+--- hdf4.2r0.orig/mfhdf/hdiff/Makefile.am	2003-11-20 22:54:42.000000000 +0100
++++ hdf4.2r0/mfhdf/hdiff/Makefile.am	2005-01-24 16:38:54.091746232 +0100
+@@ -20,8 +20,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_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ #############################################################################
+ ##                              Testing                                    ##
+@@ -32,8 +32,8 @@
+ noinst_PROGRAMS = hdifftst
+ 
+ hdifftst_SOURCES = hdifftst.c
+-hdifftst_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+-hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
++hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ check: hdifftst
+ 	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh
+diff -ru hdf4.2r0.orig/mfhdf/hrepack/Makefile.am hdf4.2r0/mfhdf/hrepack/Makefile.am
+--- hdf4.2r0.orig/mfhdf/hrepack/Makefile.am	2003-11-11 21:40:13.000000000 +0100
++++ hdf4.2r0/mfhdf/hrepack/Makefile.am	2005-01-24 16:38:54.093745928 +0100
+@@ -22,8 +22,8 @@
+                   hrepack_opttable.c hrepack_pal.c hrepack_parse.c          \
+                   hrepack_sds.c hrepack_sdutil.c hrepack_utils.c            \
+                   hrepack_vg.c hrepack_vs.c
+-hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
+-hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ #############################################################################
+ ##                   Testing -- Here there be dragons.                     ##
+@@ -43,12 +43,12 @@
+                        ../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c        \
+                        ../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c          \
+                        ../hdiff/hdiff_vs.c
+-test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
+-test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ hrepack_check_SOURCES = hrepack_check.c
+-hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
+-hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ check: test_hrepack
+ 	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh
+diff -ru hdf4.2r0.orig/mfhdf/libsrc/Makefile.am hdf4.2r0/mfhdf/libsrc/Makefile.am
+--- hdf4.2r0.orig/mfhdf/libsrc/Makefile.am	2005-01-24 16:36:23.191686000 +0100
++++ hdf4.2r0/mfhdf/libsrc/Makefile.am	2005-01-24 16:38:54.096745472 +0100
+@@ -15,7 +15,7 @@
+ 
+ lib_LTLIBRARIES = libmfhdf.la
+ 
+-## Information for building the "libmfhdf.a" library
++## Information for building the "libmfhdf.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
+@@ -49,10 +49,10 @@
+ check_PROGRAMS = cdftest hdftest
+ 
+ cdftest_SOURCES = cdftest.c
+-cdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
++cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+ 
+ hdftest_SOURCES = hdftest.c tszip.c
+-hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
++hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+ 
+ check:
+ 	@echo "============================"
+diff -ru hdf4.2r0.orig/mfhdf/ncdump/Makefile.am hdf4.2r0/mfhdf/ncdump/Makefile.am
+--- hdf4.2r0.orig/mfhdf/ncdump/Makefile.am	2003-11-07 19:39:00.000000000 +0100
++++ hdf4.2r0/mfhdf/ncdump/Makefile.am	2005-01-24 16:38:54.097745320 +0100
+@@ -19,8 +19,8 @@
+ 
+ ## Information for building the "ncdump" program
+ ncdump_SOURCES = dumplib.c ncdump.c vardata.c
+-ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
+-ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ check: ncdump $(srcdir)/test0.cdl
+ 	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
+diff -ru hdf4.2r0.orig/mfhdf/ncgen/Makefile.am hdf4.2r0/mfhdf/ncgen/Makefile.am
+--- hdf4.2r0.orig/mfhdf/ncgen/Makefile.am	2003-11-07 19:39:04.000000000 +0100
++++ hdf4.2r0/mfhdf/ncgen/Makefile.am	2005-01-24 16:38:54.116742432 +0100
+@@ -19,8 +19,8 @@
+ ## 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.a $(top_builddir)/hdf/src/libdf.a
+-ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ ## Recipe for building the ncgentab.c file
+ ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c
+diff -ru hdf4.2r0.orig/mfhdf/nctest/Makefile.am hdf4.2r0/mfhdf/nctest/Makefile.am
+--- hdf4.2r0.orig/mfhdf/nctest/Makefile.am	2003-11-07 19:39:09.000000000 +0100
++++ hdf4.2r0/mfhdf/nctest/Makefile.am	2005-01-24 16:38:54.118742128 +0100
+@@ -22,8 +22,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.a $(top_builddir)/hdf/src/libdf.a
+-nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
++nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
++nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+ 
+ #############################################################################
+ ##                          And the cleanup                                ##