author | Don Pellegrino <don@drexel.edu> | 2010-01-24 05:58:58 (GMT) |
---|---|---|
committer | Don Pellegrino <don@drexel.edu> | 2010-01-24 05:58:58 (GMT) |
commit | 7f499f1f481d563ccdbed90ef9aaa3a2c9a87dd4 (patch) (unidiff) | |
tree | 623605dcbf8177ce88bcd3e8d0ea3f082f07a025 | |
parent | 6f7b615d1e0a2aac33712792d6146b42f2623e8f (diff) | |
download | exp007-7f499f1f481d563ccdbed90ef9aaa3a2c9a87dd4.zip exp007-7f499f1f481d563ccdbed90ef9aaa3a2c9a87dd4.tar.gz exp007-7f499f1f481d563ccdbed90ef9aaa3a2c9a87dd4.tar.bz2 |
Added library dependencies iherited from use of HDF5 on NCBI Cobalt including the need for the Intel Compiler's C runtime. This will need to be cleaned up so that Cobalt specific dependencies don't pollute the baseline. Also changed compiler flag from using GNU99 standards to pure C99 for possibility of using the Intel Compiler. Note that Intel's icc accepts gnu99 but then doesn't implement it properly since it does not accept the C99 syntax of declaring variables in for loops even though GNU99 implies C99.
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index f45958c..59c5f36 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,14 +12,12 @@ AC_CONFIG_FILES([ | |||
12 | ################ | 12 | ################ |
13 | 13 | ||
14 | AC_SEARCH_LIBS([H5Fcreate],[hdf5],[], | 14 | AC_SEARCH_LIBS([H5Fcreate],[hdf5],[], |
15 | [AC_MSG_ERROR(The HDF5 libraries are needed to build the system.)]) | 15 | [AC_MSG_ERROR(The HDF5 libraries are needed to build the system.)], |
16 | [-lirc -lmpi -lz -lsz]) | ||
16 | 17 | ||
17 | AC_SEARCH_LIBS([H5TBmake_table],[hdf5_hl],[], | 18 | AC_SEARCH_LIBS([H5TBmake_table],[hdf5_hl],[], |
18 | [AC_MSG_ERROR(The HDF5 libraries are needed to build the system.)], | 19 | [AC_MSG_ERROR(The HDF5 libraries are needed to build the system.)], |
19 | [-lhdf5]) | 20 | [-lirc -lhdf5 -lmpi -lz -lsz]) |
20 | |||
21 | AC_CHECK_HEADERS([mpi.h],[], | ||
22 | [AC_MSG_ERROR(The MPI headers are needed to build the system.)]) | ||
23 | 21 | ||
24 | AC_CHECK_HEADERS([hdf5.h],[], | 22 | AC_CHECK_HEADERS([hdf5.h],[], |
25 | [AC_MSG_ERROR(The HDF5 headers are needed to build the system.)]) | 23 | [AC_MSG_ERROR(The HDF5 headers are needed to build the system.)]) |
diff --git a/src/Makefile.am b/src/Makefile.am index adc9e8d..752c0fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -10,6 +10,8 @@ aggregator_SOURCES = \ | |||
10 | model/blast_scores_data_init.c \ | 10 | model/blast_scores_data_init.c \ |
11 | model/sequence_data_init.c | 11 | model/sequence_data_init.c |
12 | 12 | ||
13 | aggregator_LDADD = -lirc -lmpi -lsz -lz | ||
14 | |||
13 | updator_SOURCES = \ | 15 | updator_SOURCES = \ |
14 | updator.c \ | 16 | updator.c \ |
15 | assign/assign_protein_type.c \ | 17 | assign/assign_protein_type.c \ |
@@ -19,6 +21,8 @@ updator_SOURCES = \ | |||
19 | model/gi_type_data_init.c \ | 21 | model/gi_type_data_init.c \ |
20 | model/sequence_data_init.c | 22 | model/sequence_data_init.c |
21 | 23 | ||
24 | updator_LDADD = -lirc -lmpi -lsz -lz | ||
25 | |||
22 | noinst_HEADERS = \ | 26 | noinst_HEADERS = \ |
23 | assign/assign_protein_type.h \ | 27 | assign/assign_protein_type.h \ |
24 | error/check_error.h \ | 28 | error/check_error.h \ |
@@ -33,4 +37,4 @@ noinst_HEADERS = \ | |||
33 | model/sequence_data.h \ | 37 | model/sequence_data.h \ |
34 | model/sequence_data_init.h | 38 | model/sequence_data_init.h |
35 | 39 | ||
36 | AM_CFLAGS = -Wall -std=gnu99 | 40 | AM_CFLAGS = -Wall -std=c99 |