diff options
Diffstat (limited to 'sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch')
| -rw-r--r-- | sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch new file mode 100644 index 000000000000..7c166040cb48 --- /dev/null +++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch @@ -0,0 +1,64 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -75,44 +75,25 @@ fi + + ########################################################################### + +-# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and +-# thus don't have the superior h4toh5 utility. Similarly for h5toh4. +-AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5) +-AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4) +- +-AC_ARG_WITH(hdf4, +- [AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh4 are present])], +- ok=$withval, ok=maybe) +-if test "x$ok" = xyes; then +- H4TOH5="" +- H5TOH4="" +-elif test "x$ok" = xno; then +- H4TOH5="h4toh5" +- H5TOH4="h5toh4" +-fi ++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) ++ ++AS_IF([test "x$with_hdf" = "xyes"], [ ++ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++ AC_CHECK_LIB(jpeg, jpeg_start_compress, ++ [AC_CHECK_LIB(df, DFSDgetdata, ++ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], ++ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], ++ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) ++ if test $HDF4 = yes; then ++ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" ++ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" ++ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" ++ fi ++ ++ AC_SUBST(H4_LIBS) ++]) + +-HDF4=no +-if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then +- AC_CHECK_LIB(jpeg, jpeg_start_compress, +- [AC_CHECK_LIB(df, DFSDgetdata, +- [H4_LIBS="-ldf -ljpeg"; HDF4=yes], +- [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], +- [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) +- +- if test $HDF4 = yes; then +- if test "x$H4TOH5" != xh4toh5; then +- MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" +- MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS" +- fi +- if test "x$H5TOH4" != xh5toh4; then +- MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" +- # MORE_H5UTILS_MANS="doc/man/h4fromh5.1 $MORE_H5UTILS_MANS" +- fi +- fi +-fi +-AC_CHECK_HEADERS(hdf.h hdf/hdf.h) + +-AC_SUBST(H4_LIBS) + + ########################################################################### + |