Attachment #217542 for bug #301049




  *)
    if test -n "$withval" ; then
        z_lib="`echo $withval |cut -f2 -d, -s`"
	ZLIB="-L$z_lib -lz"
	HAVE_ZLIB="yes"
    else
      ZLIB=""

  *)
    if test -n "$withval" ; then
        jpeg_lib="`echo $withval |cut -f2 -d, -s`"
	JPEGLIB="-L$jpeg_lib -ljpeg"
    	#AC_MSG_RESULT([jpeg found: $JPEGLIB]);
	HAVE_JPEG="yes"
    else

  *)
	if test -n "$withval" ; then
	    sz_lib="`echo $withval |cut -f2 -d, -s`"
		SZLIB="-L$sz_lib -lsz"
		#AC_MSG_RESULT([szlib found: $SZLIB]);
		HAVE_SZIP="yes"
	else

	;;
esac
if test -n "$HDF4LIB"; then
	LIBS="-L$HDF4LIB -ldf -lmfhdf $LIBS"
	HAVE_HDF4="yes"
fi
AC_MSG_RESULT([$HAVE_HDF4])

  *)
	if test -n "$withval" ; then
	    hdf5_lib="`echo $withval |cut -f2 -d, -s`"
		HDF5LIB="-L$hdf5_lib -lhdf"
	    hdf5_inc="`echo $withval |cut -f1 -d,`"
	    if test -n "$hdf5_inc"; then
	      HDF5INC="$hdf5_inc"

	;;
esac
if test -n "$HDF5LIB"; then
	LIBS="-L$HDF5LIB -lhdf5 $LIBS"
	HAVE_HDF5="yes"
fi
AC_MSG_RESULT([$HAVE_HDF5])

AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0)
fi
if test $JH45INST_FOUND -eq 1; then
        mkdir -p $JH45INST
	if test -z "$JH45INST" ; then
		JH45INST=$ac_cv_lib_JH45INST;
	fi

		JH45INST_FOUND=0
	fi
	if test \( ! -w "$JH45INST" \); then
		AC_MSG_ERROR( [ $JH45INST : not writable ])
		JH45INST_FOUND=0
	fi
fi

Lines 37-43 Link Here

(-)native/hdflib/Makefile.in.orig (-2 / +2 lines)
37	CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)	37	CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)
38		38
39	# Be sure to add -lbsd if compiling in a SYSV environment	39	# Be sure to add -lbsd if compiling in a SYSV environment
40	LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm	40	LIBS = -L$(HDFLIB) -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
41		41
42	# Macro def: object filename used	42	# Macro def: object filename used
43	OBJECTS = hdfstructsutil.o \	43	OBJECTS = hdfstructsutil.o \
Lines 56-62 Link Here
56		56
57	libjhdf: $(OBJECTS)	57	libjhdf: $(OBJECTS)
58	-mkdir -p $(LIBDIR);	58	-mkdir -p $(LIBDIR);
59	$(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)	59	$(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
60		60
61	clean:	61	clean:
62	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT)	62	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT)

Lines 33-39 Link Here

(-)native/hdf5lib/Makefile.in.orig (-2 / +2 lines)
33		33
34	CFLAGS = -DH5_USE_16_API -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)	34	CFLAGS = -DH5_USE_16_API -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
35		35
36	LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm	36	LIBS = -L$(HDF5LIB) -lhdf5 $(ZLIB) $(SZLIB) -lm
37		37
38	# Macro def: object filename used	38	# Macro def: object filename used
39	OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5fImp.o h5gImp.o h5iImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o	39	OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5fImp.o h5gImp.o h5iImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
Lines 45-51 Link Here
45		45
46	libjhdf5: $(OBJECTS)	46	libjhdf5: $(OBJECTS)
47	-mkdir -p $(LIBDIR);	47	-mkdir -p $(LIBDIR);
48	$(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)	48	$(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS)
49		49
50	clean:	50	clean:
51	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT)	51	$(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT)

Return to bug 301049

Lines 177-183 Link Here

(-)configure.in.orig (-7 / +8 lines)
177	*)	177	*)
178	if test -n "$withval" ; then	178	if test -n "$withval" ; then
179	z_lib="`echo $withval \|cut -f2 -d, -s`"	179	z_lib="`echo $withval \|cut -f2 -d, -s`"
180	ZLIB=$z_lib"/libz."$LLEXT	180	ZLIB="-L$z_lib -lz"
181	HAVE_ZLIB="yes"	181	HAVE_ZLIB="yes"
182	else	182	else
183	ZLIB=""	183	ZLIB=""
Lines 211-217 Link Here
211	*)	211	*)
212	if test -n "$withval" ; then	212	if test -n "$withval" ; then
213	jpeg_lib="`echo $withval \|cut -f2 -d, -s`"	213	jpeg_lib="`echo $withval \|cut -f2 -d, -s`"
214	JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT	214	JPEGLIB="-L$jpeg_lib -ljpeg"
215	#AC_MSG_RESULT([jpeg found: $JPEGLIB]);	215	#AC_MSG_RESULT([jpeg found: $JPEGLIB]);
216	HAVE_JPEG="yes"	216	HAVE_JPEG="yes"
217	else	217	else
Lines 246-252 Link Here
246	*)	246	*)
247	if test -n "$withval" ; then	247	if test -n "$withval" ; then
248	sz_lib="`echo $withval \|cut -f2 -d, -s`"	248	sz_lib="`echo $withval \|cut -f2 -d, -s`"
249	SZLIB=$sz_lib"/libsz."$LLEXT	249	SZLIB="-L$sz_lib -lsz"
250	#AC_MSG_RESULT([szlib found: $SZLIB]);	250	#AC_MSG_RESULT([szlib found: $SZLIB]);
251	HAVE_SZIP="yes"	251	HAVE_SZIP="yes"
252	else	252	else
Lines 302-308 Link Here
302	;;	302	;;
303	esac	303	esac
304	if test -n "$HDF4LIB"; then	304	if test -n "$HDF4LIB"; then
305	LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"	305	LIBS="-L$HDF4LIB -ldf -lmfhdf $LIBS"
306	HAVE_HDF4="yes"	306	HAVE_HDF4="yes"
307	fi	307	fi
308	AC_MSG_RESULT([$HAVE_HDF4])	308	AC_MSG_RESULT([$HAVE_HDF4])
Lines 363-369 Link Here
363	*)	363	*)
364	if test -n "$withval" ; then	364	if test -n "$withval" ; then
365	hdf5_lib="`echo $withval \|cut -f2 -d, -s`"	365	hdf5_lib="`echo $withval \|cut -f2 -d, -s`"
366	HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"	366	HDF5LIB="-L$hdf5_lib -lhdf"
367	hdf5_inc="`echo $withval \|cut -f1 -d,`"	367	hdf5_inc="`echo $withval \|cut -f1 -d,`"
368	if test -n "$hdf5_inc"; then	368	if test -n "$hdf5_inc"; then
369	HDF5INC="$hdf5_inc"	369	HDF5INC="$hdf5_inc"
Lines 380-386 Link Here
380	;;	380	;;
381	esac	381	esac
382	if test -n "$HDF5LIB"; then	382	if test -n "$HDF5LIB"; then
383	LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"	383	LIBS="-L$HDF5LIB -lhdf5 $LIBS"
384	HAVE_HDF5="yes"	384	HAVE_HDF5="yes"
385	fi	385	fi
386	AC_MSG_RESULT([$HAVE_HDF5])	386	AC_MSG_RESULT([$HAVE_HDF5])
Lines 626-631 Link Here
626	AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0)	626	AC_CACHE_CHECK("JH45 install directory",ac_cv_lib_JH45INST,JH45INST_FOUND=0)
627	fi	627	fi
628	if test $JH45INST_FOUND -eq 1; then	628	if test $JH45INST_FOUND -eq 1; then
		629	mkdir -p $JH45INST
629	if test -z "$JH45INST" ; then	630	if test -z "$JH45INST" ; then
630	JH45INST=$ac_cv_lib_JH45INST;	631	JH45INST=$ac_cv_lib_JH45INST;
631	fi	632	fi
Lines 633-639 Link Here
633	JH45INST_FOUND=0	634	JH45INST_FOUND=0
634	fi	635	fi
635	if test \( ! -w "$JH45INST" \); then	636	if test \( ! -w "$JH45INST" \); then
636	AC_MSG_ERROR( [ $JAVINST : not writable ])	637	AC_MSG_ERROR( [ $JH45INST : not writable ])
637	JH45INST_FOUND=0	638	JH45INST_FOUND=0
638	fi	639	fi
639	fi	640	fi