diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2015-04-02 21:07:53 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2015-04-02 21:07:53 (GMT) |
| commit | 3032f3adf388e74935d19b6e00ee1637123d1682 (patch) | |
| tree | 836df7aff039bcb4beb30034ec24001cbe4d0e3a /c++ | |
| parent | 33c8035f0e8cd62b0fc4b5100f922426b1b77a8f (diff) | |
| download | hdf5-3032f3adf388e74935d19b6e00ee1637123d1682.zip hdf5-3032f3adf388e74935d19b6e00ee1637123d1682.tar.gz hdf5-3032f3adf388e74935d19b6e00ee1637123d1682.tar.bz2 | |
[svn-r26711] Recommitting revisions 26669 and 26670, removing VPATH and redundant /usr/include and lib in fcompile and link flags checks, now that I have run reconfigure.
Also changed paths to h5cc, etc. in scripts to run installed examples from relative paths to absolute paths.
Tested with h5committest.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/examples/run-c++-ex.sh.in | 2 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index 625fc27..c964e95 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -462,7 +462,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ H5_LDFLAGS = @H5_LDFLAGS@ -H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 165479b..c8d6b18 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -410,7 +410,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ H5_LDFLAGS = @H5_LDFLAGS@ -H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in index 77ac36a..eae2782 100644 --- a/c++/examples/run-c++-ex.sh.in +++ b/c++/examples/run-c++-ex.sh.in @@ -34,7 +34,7 @@ EXIT_FAILURE=1 # Where the tool is installed. # default is relative path to installed location of the tools -prefix="${prefix:-../../../}" +prefix="${prefix:-@prefix@}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 54a4c0e..55c3577 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -473,7 +473,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ H5_LDFLAGS = @H5_LDFLAGS@ -H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 2ffe608..8711eef 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -464,7 +464,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ H5_LDFLAGS = @H5_LDFLAGS@ -H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ |