diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-09 14:51:34 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-09 14:51:34 (GMT) |
| commit | acabad61facccea62d5d12c76ccb09d107e9062c (patch) | |
| tree | a45b4d2c914786e341c403bd506890cde8e15861 /configure.ac | |
| parent | 992e79b58cf83a75f7567d73d7e7d534750c3d68 (diff) | |
| parent | 50c5f1ab2c706e00ec546c4f5a415b4203a5db7e (diff) | |
| download | hdf5-acabad61facccea62d5d12c76ccb09d107e9062c.zip hdf5-acabad61facccea62d5d12c76ccb09d107e9062c.tar.gz hdf5-acabad61facccea62d5d12c76ccb09d107e9062c.tar.bz2 | |
[svn-r25968] merge from trunk.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f85c718..541c9f0 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.9.205], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.9.210], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADER([src/H5config.h]) @@ -115,11 +115,7 @@ AM_CFLAGS="${AM_CFLAGS}" AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" -if test "x$prefix" = xNONE; then - AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib" -else - AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" -fi +AM_LDFLAGS="${AM_LDFLAGS}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" @@ -4485,7 +4481,6 @@ AC_CONFIG_FILES([src/libhdf5.settings test/test_plugin.sh test/test_vol_plugin.sh testpar/Makefile - perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh @@ -4512,6 +4507,7 @@ AC_CONFIG_FILES([src/libhdf5.settings tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile + tools/perform/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh |