| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Tue, 30 Aug 2016 23:24:53 +0200 |
| 4 | Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to |
| 5 | correct implementation |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 13 | --- |
| 14 | configure.ac | 31 ++++--------------------------- |
| 15 | 1 file changed, 4 insertions(+), 27 deletions(-) |
| 16 | |
| 17 | diff --git a/configure.ac b/configure.ac |
| 18 | index 4f2118e..16c09d5 100644 |
| 19 | --- a/configure.ac |
| 20 | +++ b/configure.ac |
| 21 | @@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t") |
| 22 | |
| 23 | AC_LANG_PUSH(C++) |
| 24 | |
| 25 | -AC_CHECK_HEADERS(unordered_map, |
| 26 | - [ |
| 27 | - AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided]) |
| 28 | - GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1 |
| 29 | - ], |
| 30 | - [ |
| 31 | - GMV_HAVE_UNORDERED_MAP_CFLAGS= |
| 32 | - ] |
| 33 | -) |
| 34 | +GMV_HAVE_UNORDERED_MAP_CFLAGS= |
| 35 | AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS) |
| 36 | -AC_CHECK_HEADERS(hash_map, |
| 37 | - [ |
| 38 | - AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided]) |
| 39 | - GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1 |
| 40 | - ], |
| 41 | - [ |
| 42 | - GMV_HAVE_HASH_MAP_CFLAGS= |
| 43 | - ] |
| 44 | -) |
| 45 | +GMV_HAVE_HASH_MAP_CFLAGS= |
| 46 | AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS) |
| 47 | -AC_CHECK_HEADERS(ext/hash_map, |
| 48 | - [ |
| 49 | - AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) |
| 50 | - GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 |
| 51 | - ], |
| 52 | - [ |
| 53 | - GMV_HAVE_EXT_HASH_MAP_CFLAGS= |
| 54 | - ] |
| 55 | -) |
| 56 | +AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) |
| 57 | +GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 |
| 58 | AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS) |
| 59 | |
| 60 | AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits]) |
| 61 | -- |
| 62 | 2.5.5 |
| 63 | |