diff options
| author | David Tardon <dtardon@redhat.com> | 2011-01-04 07:09:28 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-01-04 07:09:28 +0100 |
| commit | d1d813c7f2133957dd8355b2e6a589b54a6ea7c2 (patch) | |
| tree | b9966fb65f292bf4ecc2c9d7f8568eee21a498f9 | |
| parent | ff5797e651a42f305c67ef76b773a5a4894cdd9a (diff) | |
selection of hash container for mdds must precede header tests
| -rwxr-xr-x | configure.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index a7f4663197c5..367a1b288d3f 100755 --- a/configure.in +++ b/configure.in @@ -4830,15 +4830,6 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \ test "$with_system_mdds" != "no"; then AC_MSG_RESULT([external]) SYSTEM_MDDS=YES - AC_LANG_PUSH([C++]) - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS" - AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [], - [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], []) - AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [], - [AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], []) - CPPFLAGS="$save_CPPFLAGS" - AC_LANG_POP([C++]) dnl =================================================================== dnl Determine which hash container mdds shall use @@ -4854,6 +4845,16 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \ MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_STLPORT" AC_MSG_RESULT([std::hash_map]) fi + + AC_LANG_PUSH([C++]) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS" + AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [], + [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], []) + AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [], + [AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], []) + CPPFLAGS="$save_CPPFLAGS" + AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE MDDS" |