SOURCES: hdf-shared.patch - updated for 4.2r4 (mostly obsolete)
qboosh
qboosh at pld-linux.org
Fri Apr 24 07:00:31 CEST 2009
Author: qboosh Date: Fri Apr 24 05:00:31 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.2r4 (mostly obsolete)
---- Files affected:
SOURCES:
hdf-shared.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/hdf-shared.patch
diff -u SOURCES/hdf-shared.patch:1.8 SOURCES/hdf-shared.patch:1.9
--- SOURCES/hdf-shared.patch:1.8 Wed Jun 4 22:23:37 2008
+++ SOURCES/hdf-shared.patch Fri Apr 24 07:00:25 2009
@@ -1,395 +1,15 @@
---- HDF4.2r3/hdf/src/Makefile.am.orig 2006-12-06 21:51:13.000000000 +0100
-+++ HDF4.2r3/hdf/src/Makefile.am 2008-06-04 19:39:45.388885271 +0200
-@@ -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 dfufp2iff.f dfutilf.c herrf.c hfilef.c \
-@@ -27,10 +27,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) hproto_fortran.h $(FHEADERS)
- else
--libdf_a_SOURCES = $(CSOURCES)
-+libdf_la_SOURCES = $(CSOURCES)
- include_HEADERS = $(CHEADERS)
- endif
-
---- HDF4.2r3/hdf/test/Makefile.am.orig 2007-12-13 08:39:20.000000000 +0100
-+++ HDF4.2r3/hdf/test/Makefile.am 2008-06-04 19:40:41.856099802 +0200
-@@ -21,23 +21,23 @@
- 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.a
--testhdf_DEPENDENCIES = testdir ../src/libdf.a
-+testhdf_LDADD = ../src/libdf.la
-+testhdf_DEPENDENCIES = testdir ../src/libdf.la
-
--buffer_LDADD = ../src/libdf.a
--buffer_DEPENDENCIES = ../src/libdf.a
-+buffer_LDADD = ../src/libdf.la
-+buffer_DEPENDENCIES = ../src/libdf.la
-
- if HDF_BUILD_FORTRAN
- fortest_SOURCES = fortest.c
--fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
--fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
-+fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
-+fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.la ../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 = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
--fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
-+fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
-+fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
- endif
-
- testdir:
---- HDF4.2r0/hdf/util/Makefile.am.orig 2003-11-07 19:38:46.000000000 +0100
-+++ HDF4.2r0/hdf/util/Makefile.am 2004-03-06 13:04:38.110448752 +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. ##
---- HDF4.2r0/mfhdf/dumper/Makefile.am.orig 2003-11-07 19:38:49.000000000 +0100
-+++ HDF4.2r0/mfhdf/dumper/Makefile.am 2004-03-06 13:05:56.513529672 +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. ##
---- HDF4.2r3/mfhdf/fortran/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
-+++ HDF4.2r3/mfhdf/fortran/Makefile.am 2008-06-04 19:41:26.934667007 +0200
-@@ -25,18 +25,18 @@
- if HDF_BUILD_NETCDF
- 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
- endif
-
- 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
-
- tszip_SOURCES = tszip.f
--tszip_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
--tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
-+tszip_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-+tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
-
- testdir:
- -mkdir testdir
---- HDF4.2r3/mfhdf/hdfimport/Makefile.am.orig 2006-10-11 21:58:16.000000000 +0200
-+++ HDF4.2r3/mfhdf/hdfimport/Makefile.am 2008-06-04 19:41:57.528410445 +0200
-@@ -14,7 +14,7 @@
- ## Libraries to link against ##
- #############################################################################
-
--LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-+LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
-
- #############################################################################
- ## Programs to build ##
---- HDF4.2r3/mfhdf/hdiff/Makefile.am.orig 2007-07-17 22:37:19.000000000 +0200
-+++ HDF4.2r3/mfhdf/hdiff/Makefile.am 2008-06-04 19:42:15.165415521 +0200
-@@ -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_dim.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
---- HDF4.2r3/mfhdf/hrepack/Makefile.am.orig 2007-09-18 17:12:00.000000000 +0200
-+++ HDF4.2r3/mfhdf/hrepack/Makefile.am 2008-06-04 19:42:39.786818615 +0200
-@@ -22,8 +22,8 @@
- hrepack_opttable.c hrepack_parse.c \
- hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \
- hrepack_vg.c hrepack_vs.c hrepack_dim.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. ##
-@@ -44,12 +44,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.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
-
- #############################################################################
- ## And the cleanup ##
---- HDF4.2r3/mfhdf/libsrc/Makefile.am.orig 2008-01-17 00:53:53.000000000 +0100
-+++ HDF4.2r3/mfhdf/libsrc/Makefile.am 2008-06-04 19:43:18.953050571 +0200
-@@ -13,7 +13,8 @@
- ## Library to build ##
- #############################################################################
-
--lib_LIBRARIES = libmfhdf.a
-+lib_LTLIBRARIES = libmfhdf.la
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.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 \
-@@ -31,17 +32,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
-@@ -59,12 +60,12 @@
- 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 tchunk.c tcomp.c tcoordvar.c tdim.c \
- temptySDSs.c tfile.c tidtypes.c tnetcdf.c trank0.c \
- tsd.c tsdsprops.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 "============================"
---- HDF4.2r0/mfhdf/ncdump/Makefile.am.orig 2003-11-07 19:39:00.000000000 +0100
-+++ HDF4.2r0/mfhdf/ncdump/Makefile.am 2004-03-06 13:08:09.879255000 +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
---- HDF4.2r3/mfhdf/ncgen/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
-+++ HDF4.2r3/mfhdf/ncgen/Makefile.am 2008-06-04 19:45:27.852403668 +0200
-@@ -29,8 +29,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
-
- ctest0_SOURCES=
- ftest0_SOURCES=
-@@ -102,7 +102,7 @@
-
- ftest0$(EXEEXT): ncgen test0.cdl netcdf.inc
- $(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
-- $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=F77 $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
- endif
-
- endif
-@@ -118,7 +118,7 @@
-
- ctest0$(EXEEXT): ncgen $(srcdir)/test0.cdl
- $(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
-- $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
-
- #############################################################################
- ## Miscellaneous ##
---- HDF4.2r0/mfhdf/nctest/Makefile.am.orig 2003-11-07 19:39:09.000000000 +0100
-+++ HDF4.2r0/mfhdf/nctest/Makefile.am 2004-03-06 13:08:38.075968448 +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 ##
---- HDF4.2r0/configure.ac.orig 2003-11-21 21:06:01.000000000 +0100
-+++ HDF4.2r0/configure.ac 2004-03-06 12:59:06.973789176 +0100
-@@ -166,7 +166,7 @@
+--- HDF4.2r4/configure.ac.orig 2009-01-13 22:13:49.000000000 +0100
++++ HDF4.2r4/configure.ac 2009-04-23 23:36:13.513713807 +0200
+@@ -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_LN_S
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_YACC
-
- AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+ AC_PROG_INSTALL
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdf-shared.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list