[llvm-commits] CVS: llvm/autoconf/m4/cxx_hash_map.m4 cxx_hash_set.m4

[John Criswell]

Changes in directory llvm/autoconf/m4:

cxx_hash_map.m4 updated: 1.2 -> 1.3
cxx_hash_set.m4 updated: 1.2 -> 1.3
---
Log message:

Modified hash_map and hash_set configuration so that they are not
regenerated on every run of configure.




---
Diffs of the changes:  (+24 -18)

Index: llvm/autoconf/m4/cxx_hash_map.m4
diff -u llvm/autoconf/m4/cxx_hash_map.m4:1.2 llvm/autoconf/m4/cxx_hash_map.m4:1.3
--- llvm/autoconf/m4/cxx_hash_map.m4:1.2	Sun Sep 19 17:31:49 2004
+++ llvm/autoconf/m4/cxx_hash_map.m4	Fri Sep 24 13:27:58 2004
@@ -10,12 +10,13 @@
 using namespace std;
 #endif]], [[hash_map<int, int> t;]])],[ac_cv_cxx_have_std_ext_hash_map=yes],[ac_cv_cxx_have_std_ext_hash_map=no])
   AC_LANG_POP([C++])])
- HAVE_STD_EXT_HASH_MAP=0
  if test "$ac_cv_cxx_have_std_ext_hash_map" = yes
  then
-   HAVE_STD_EXT_HASH_MAP=1
+   AC_DEFINE(HAVE_STD_EXT_HASH_MAP,1,[Have ext/hash_map>])
+ else
+   AC_DEFINE(HAVE_STD_EXT_HASH_MAP,0,[Does not have ext/hash_map>])
  fi
- AC_SUBST(HAVE_STD_EXT_HASH_MAP)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP],
 [AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map],
@@ -27,12 +28,13 @@
 using namespace __gnu_cxx;
 #endif]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
   AC_LANG_POP([C++])])
- HAVE_GNU_EXT_HASH_MAP=0
  if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes
  then
-   HAVE_GNU_EXT_HASH_MAP=1
+   AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,1,[Have ext/hash_map])
+ else
+   AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,0,[Does not have ext/hash_map])
  fi
- AC_SUBST(HAVE_GNU_EXT_HASH_MAP)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP],
 [AC_CACHE_CHECK([whether the compiler has <hash_map> defining template class ::hash_map],
@@ -41,12 +43,13 @@
   AC_LANG_PUSH([C++])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_map>]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_global_hash_map=yes],[ac_cv_cxx_have_global_hash_map=no])
   AC_LANG_POP([C++])])
- HAVE_GLOBAL_HASH_MAP=0
  if test "$ac_cv_cxx_have_global_hash_map" = yes
  then
-   HAVE_GLOBAL_HASH_MAP=1
+   AC_DEFINE(HAVE_GLOBAL_HASH_MAP,1,[Have <hash_map>])
+ else
+   AC_DEFINE(HAVE_GLOBAL_HASH_MAP,0,[Does not have <hash_map>])
  fi
- AC_SUBST(HAVE_GLOBAL_HASH_MAP)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_HASH_MAP],
 [AC_CXX_HAVE_STD_EXT_HASH_MAP


Index: llvm/autoconf/m4/cxx_hash_set.m4
diff -u llvm/autoconf/m4/cxx_hash_set.m4:1.2 llvm/autoconf/m4/cxx_hash_set.m4:1.3
--- llvm/autoconf/m4/cxx_hash_set.m4:1.2	Sun Sep 19 17:31:49 2004
+++ llvm/autoconf/m4/cxx_hash_set.m4	Fri Sep 24 13:27:58 2004
@@ -10,12 +10,13 @@
 using namespace std;
 #endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_std_ext_hash_set=yes],[ac_cv_cxx_have_std_ext_hash_set=no])
   AC_LANG_POP([C++])])
- HAVE_STD_EXT_HASH_SET=0
  if test "$ac_cv_cxx_have_std_ext_hash_set" = yes
  then
-   HAVE_STD_EXT_HASH_SET=1
+   AC_DEFINE(HAVE_STD_EXT_HASH_SET,1,[Have hash_set in std namespace])
+ else
+   AC_DEFINE(HAVE_STD_EXT_HASH_SET,0,[Does not have hash_set in std namespace])
  fi
- AC_SUBST(HAVE_STD_EXT_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
 [AC_CACHE_CHECK(
@@ -28,12 +29,13 @@
 using namespace __gnu_cxx;
 #endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_set=yes],[ac_cv_cxx_have_gnu_ext_hash_set=no])
   AC_LANG_POP([C++])])
- HAVE_GNU_EXT_HASH_SET=0
  if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes
  then
-   HAVE_GNU_EXT_HASH_SET=1
+   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,1,[Have hash_set in gnu namespace])
+ else
+   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,0,[Does not have hash_set in gnu namespace])
  fi
- AC_SUBST(HAVE_GNU_EXT_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
 [AC_CACHE_CHECK([whether the compiler has <hash_set> defining template class ::hash_set],
@@ -42,12 +44,13 @@
   AC_LANG_PUSH([C++])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_set>]], [[hash_set<int> t; return 0;]])],[ac_cv_cxx_have_global_hash_set=yes],[ac_cv_cxx_have_global_hash_set=no])
   AC_LANG_POP([C++])])
- HAVE_GLOBAL_HASH_SET=0
  if test "$ac_cv_cxx_have_global_hash_set" = yes
  then
-   HAVE_GLOBAL_HASH_SET=1
+   AC_DEFINE(HAVE_GLOBAL_HASH_SET,1,[Have hash_set in global namespace])
+ else
+   AC_DEFINE(HAVE_GLOBAL_HASH_SET,0,[Does not have hash_set in global namespace])
  fi
- AC_SUBST(HAVE_GLOBAL_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_HASH_SET],
 [AC_CXX_HAVE_STD_EXT_HASH_SET