"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
h5utils-1.13.1.tar.gz and h5utils-1.13.2.tar.gz

About: h5utils is a set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format.

configure.ac  (h5utils-1.13.1):configure.ac  (h5utils-1.13.2)
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT(h5utils, 1.13.1, stevenj@alum.mit.edu) AC_INIT([h5utils],[1.13.2],[stevenj@alum.mit.edu])
AM_INIT_AUTOMAKE([foreign silent-rules 1.6]) AM_INIT_AUTOMAKE([foreign silent-rules 1.6])
AM_SILENT_RULES(yes) AM_SILENT_RULES(yes)
AC_CONFIG_SRCDIR([h5topng.c]) AC_CONFIG_SRCDIR([h5topng.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_LIB(m, sin) AC_CHECK_LIB(m, sin)
AC_CHECK_FUNCS(snprintf) AC_CHECK_FUNCS(snprintf)
MORE_H5UTILS="" MORE_H5UTILS=""
MORE_H5UTILS_MANS="" MORE_H5UTILS_MANS=""
########################################################################### ###########################################################################
dnl override CFLAGS selection when debugging dnl override CFLAGS selection when debugging
if test "${enable_debug}" = "yes"; then if test "${enable_debug}" = "yes"; then
CFLAGS="-g" CFLAGS="-g"
fi fi
dnl add gcc warnings, in debug/maintainer mode only dnl add gcc warnings, in debug/maintainer mode only
if test "$enable_debug" = yes || test "$USE_MAINTAINER_MODE" = yes; then if test "$enable_debug" = yes || test "$USE_MAINTAINER_MODE" = yes; then
if test $ac_cv_prog_gcc = yes; then if test $ac_cv_c_compiler_gnu = yes; then
CFLAGS="$CFLAGS -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -Wno-long-long -Wshadow -Wbad-function-cast -Wwrite-strings -Wstrict- prototypes -Wredundant-decls -Wnested-externs" # -Wundef -Wconversion -Wmissing- prototypes -Wmissing-declarations CFLAGS="$CFLAGS -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -Wno-long-long -Wshadow -Wbad-function-cast -Wwrite-strings -Wstrict- prototypes -Wredundant-decls -Wnested-externs" # -Wundef -Wconversion -Wmissing- prototypes -Wmissing-declarations
fi fi
fi fi
########################################################################### ###########################################################################
H5TOPNG=yes H5TOPNG=yes
PNG_LIBS="" PNG_LIBS=""
AC_CHECK_LIB(z, inflate, ok=yes, ok=no) AC_CHECK_LIB(z, inflate, ok=yes, ok=no)
skipping to change at line 84 skipping to change at line 81
fi fi
########################################################################### ###########################################################################
# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and # 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. # thus don't have the superior h4toh5 utility. Similarly for h5toh4.
AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5) AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5)
AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4) AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4)
AC_ARG_WITH(hdf4, AC_ARG_WITH(hdf4,
[AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh 4 are present])], [AS_HELP_STRING([--with-hdf4],[build hdf4 utils even if h4toh5 and h5toh4 are present])],
ok=$withval, ok=maybe) ok=$withval, ok=maybe)
if test "x$ok" = xyes; then if test "x$ok" = xyes; then
H4TOH5="" H4TOH5=""
H5TOH4="" H5TOH4=""
elif test "x$ok" = xno; then elif test "x$ok" = xno; then
H4TOH5="h4toh5" H4TOH5="h4toh5"
H5TOH4="h5toh4" H5TOH4="h5toh4"
fi fi
HDF4=no HDF4=no
skipping to change at line 124 skipping to change at line 121
AC_SUBST(H4_LIBS) AC_SUBST(H4_LIBS)
########################################################################### ###########################################################################
AC_CHECK_LIB(hdf5, H5Fopen, [LIBS="-lhdf5 $LIBS"], AC_CHECK_LIB(hdf5, H5Fopen, [LIBS="-lhdf5 $LIBS"],
[AC_MSG_ERROR([hdf5 libraries are required for compilation])]) [AC_MSG_ERROR([hdf5 libraries are required for compilation])])
########################################################################### ###########################################################################
AC_ARG_WITH(octave, [AC_HELP_STRING([--without-octave], [don't compile h5read Oc tave plugin])], ok=$withval, ok=yes) AC_ARG_WITH(octave, [AS_HELP_STRING([--without-octave],[don't compile h5read Oct ave plugin])], ok=$withval, ok=yes)
H5READ="" H5READ=""
OCT_INSTALL_DIR="" OCT_INSTALL_DIR=""
if test "x$ok" = xyes; then if test "x$ok" = xyes; then
AC_CHECK_PROGS(MKOCTFILE, mkoctfile, echo) AC_CHECK_PROGS(MKOCTFILE, mkoctfile, echo)
if test "$MKOCTFILE" = "echo"; then if test "$MKOCTFILE" = "echo"; then
AC_MSG_WARN([can't find mkoctfile: won't be able to compile h5read.oct]) AC_MSG_WARN([can't find mkoctfile: won't be able to compile h5read.oct])
else else
# try to find installation directory # try to find installation directory
skipping to change at line 163 skipping to change at line 160
AC_MSG_WARN([can't find where to install octave plugins: won't be able to compile h5read.oct]) AC_MSG_WARN([can't find where to install octave plugins: won't be able to compile h5read.oct])
fi fi
fi fi
fi fi
AC_SUBST(H5READ) AC_SUBST(H5READ)
AC_SUBST(OCT_INSTALL_DIR) AC_SUBST(OCT_INSTALL_DIR)
########################################################################### ###########################################################################
AC_ARG_WITH(v5d, [AC_HELP_STRING([--with-v5d=<dir>], [use Vis5d in <dir> for h5t ov5d])], ok=$withval, ok=yes) AC_ARG_WITH(v5d, [AS_HELP_STRING([--with-v5d=<dir>],[use Vis5d in <dir> for h5to v5d])], ok=$withval, ok=yes)
H5TOV5D=no H5TOV5D=no
V5D_FILES="" V5D_FILES=""
V5D_INCLUDES="" V5D_INCLUDES=""
if test "$ok" = "yes"; then if test "$ok" = "yes"; then
AC_CHECK_LIB(v5d, v5dCreate, V5D_FILES="-lv5d"; H5TOV5D=yes) AC_CHECK_LIB(v5d, v5dCreate, V5D_FILES="-lv5d"; H5TOV5D=yes)
AC_CHECK_HEADERS(vis5d/v5d.h) AC_CHECK_HEADERS(vis5d/v5d.h)
AC_CHECK_HEADER(vis5d+/v5d.h, [AC_DEFINE([HAVE_VIS5Dp_V5D_H], 1, [[Define if you have the <vis5d+/v5d.h> header file.]])]) AC_CHECK_HEADER(vis5d+/v5d.h, [AC_DEFINE([HAVE_VIS5Dp_V5D_H], 1, [[Define if you have the <vis5d+/v5d.h> header file.]])])
elif test "$ok" != "no"; then elif test "$ok" != "no"; then
AC_MSG_CHECKING([for Vis5d object files and headers]) AC_MSG_CHECKING([for Vis5d object files and headers])
if test -r "$ok/src/v5d.o" -a -r "$ok/src/binio.o" -a -r "$ok/src/v5d.h" -a -r "$ok/src/binio.h"; then if test -r "$ok/src/v5d.o" -a -r "$ok/src/binio.o" -a -r "$ok/src/v5d.h" -a -r "$ok/src/binio.h"; then
skipping to change at line 201 skipping to change at line 198
fi fi
AC_SUBST(V5D_FILES) AC_SUBST(V5D_FILES)
AC_SUBST(V5D_INCLUDES) AC_SUBST(V5D_INCLUDES)
########################################################################### ###########################################################################
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h stdint.h inttypes.h]) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h stdint.h inttypes.h])
AC_CHECK_TYPES([uint16_t, uint32_t]) AC_CHECK_TYPES([uint16_t, uint32_t])
AC_MSG_CHECKING([for htons]) AC_MSG_CHECKING([for htons])
AC_TRY_LINK([#if defined(HAVE_ARPA_INET_H) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h> #include <arpa/inet.h>
#elif defined(HAVE_NETINET_IN_H) #elif defined(HAVE_NETINET_IN_H)
#include <netinet/in.h> #include <netinet/in.h>
#endif], [unsigned short i; htons(i);], [htons=yes #endif]], [[unsigned short i; htons(i);]])],[htons=yes
AC_DEFINE([HAVE_HTONS],1,[Define if you have htons.])], htons=no) AC_DEFINE([HAVE_HTONS],1,[Define if you have htons.])],[htons=no])
AC_MSG_RESULT($htons) AC_MSG_RESULT($htons)
AC_CHECK_SIZEOF(float) AC_CHECK_SIZEOF(float)
AC_MSG_CHECKING([for htonl]) AC_MSG_CHECKING([for htonl])
AC_TRY_LINK([#if defined(HAVE_ARPA_INET_H) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h> #include <arpa/inet.h>
#elif defined(HAVE_NETINET_IN_H) #elif defined(HAVE_NETINET_IN_H)
#include <netinet/in.h> #include <netinet/in.h>
#endif], [unsigned long i; htonl(i);], [htonl=yes #endif]], [[unsigned long i; htonl(i);]])],[htonl=yes
AC_DEFINE([HAVE_HTONL],1,[Define if you have htonl.])], htonl=no) AC_DEFINE([HAVE_HTONL],1,[Define if you have htonl.])],[htonl=no])
AC_MSG_RESULT($htonl) AC_MSG_RESULT($htonl)
if test "x$htons" != xyes -o "x$htonl" != xyes; then if test "x$htons" != xyes -o "x$htonl" != xyes; then
AC_C_BIGENDIAN AC_C_BIGENDIAN
fi fi
########################################################################### ###########################################################################
# Store datadir (e.g. /usr/local/share) in DATADIR #define. # Store datadir (e.g. /usr/local/share) in DATADIR #define.
# Requires some hackery to actually get this value... # Requires some hackery to actually get this value...
save_prefix=$prefix save_prefix=$prefix
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
eval datadir_val=$datadir eval datadir_val=$datadir
eval datadir_val=$datadir_val eval datadir_val=$datadir_val
prefix=$save_prefix prefix=$save_prefix
AC_DEFINE_UNQUOTED(DATADIR, "$datadir_val", [datadir installation prefix]) AC_DEFINE_UNQUOTED(DATADIR, "$datadir_val", [datadir installation prefix])
AC_SUBST(datadir_val) AC_SUBST(datadir_val)
# check for POSIX wordexp function if we need expand ~ etcetera
AC_CHECK_HEADERS([wordexp.h])
AC_CHECK_FUNCS(wordexp)
########################################################################### ###########################################################################
AC_SUBST(MORE_H5UTILS) AC_SUBST(MORE_H5UTILS)
AC_SUBST(MORE_H5UTILS_MANS) AC_SUBST(MORE_H5UTILS_MANS)
########################################################################### ###########################################################################
AC_CONFIG_FILES([Makefile doc/man/h5topng.1]) AC_CONFIG_FILES([Makefile doc/man/h5topng.1])
AC_OUTPUT AC_OUTPUT
 End of changes. 11 change blocks. 
14 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)