don't test for hash_{map,set} classes if we have unordered_map
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
9967de0267
commit
0168402389
441
configure
vendored
441
configure
vendored
@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Id: configure.in 53976 2008-06-04 10:53:02Z SN .
|
# From configure.in Id: configure.in 54169 2008-06-12 18:43:41Z VZ .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||||
#
|
#
|
||||||
@ -24698,223 +24698,6 @@ _ACEOF
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for hash_map" >&5
|
|
||||||
echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_header_hash_map+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <hash_map>
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext
|
|
||||||
if { (ac_try="$ac_compile"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_cxx_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest.$ac_objext; then
|
|
||||||
ac_cv_header_hash_map=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_header_hash_map=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
|
|
||||||
if test $ac_cv_header_hash_map = yes; then
|
|
||||||
{ echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
|
|
||||||
echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
|
|
||||||
if test "${wx_cv_class_stdhashmapset+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <hash_map>
|
|
||||||
#include <hash_set>
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
|
|
||||||
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext
|
|
||||||
if { (ac_try="$ac_compile"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_cxx_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest.$ac_objext; then
|
|
||||||
wx_cv_class_stdhashmapset=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
wx_cv_class_stdhashmapset=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
|
|
||||||
echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "$wx_cv_class_stdhashmapset" = yes; then
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define HAVE_HASH_MAP 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define HAVE_STD_HASH_MAP 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for ext/hash_map" >&5
|
|
||||||
echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_header_ext_hash_map+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <ext/hash_map>
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext
|
|
||||||
if { (ac_try="$ac_compile"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_cxx_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest.$ac_objext; then
|
|
||||||
ac_cv_header_ext_hash_map=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_header_ext_hash_map=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
|
|
||||||
if test $ac_cv_header_ext_hash_map = yes; then
|
|
||||||
{ echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
|
|
||||||
echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
|
|
||||||
if test "${wx_cv_class_gnuhashmapset+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <ext/hash_map>
|
|
||||||
#include <ext/hash_set>
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
|
|
||||||
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext
|
|
||||||
if { (ac_try="$ac_compile"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_cxx_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest.$ac_objext; then
|
|
||||||
wx_cv_class_gnuhashmapset=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
wx_cv_class_gnuhashmapset=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
|
|
||||||
echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "$wx_cv_class_gnuhashmapset" = yes; then
|
if test "$wx_cv_class_gnuhashmapset" = yes; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define HAVE_EXT_HASH_MAP 1
|
#define HAVE_EXT_HASH_MAP 1
|
||||||
@ -25146,14 +24929,232 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
if test "$wx_cv_class_tr1unorderedmapset" = yes; then
|
if test "$wx_cv_class_tr1unorderedmapset" = yes; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define HAVE_TR1_UNORDERED_MAP 1
|
#define HAVE_TR1_UNORDERED_MAP 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define HAVE_TR1_UNORDERED_SET 1
|
#define HAVE_TR1_UNORDERED_SET 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
|
else
|
||||||
|
{ echo "$as_me:$LINENO: checking for hash_map" >&5
|
||||||
|
echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
|
||||||
|
if test "${ac_cv_header_hash_map+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include <hash_map>
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (ac_try="$ac_compile"
|
||||||
|
case "(($ac_try" in
|
||||||
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
*) ac_try_echo=$ac_try;;
|
||||||
|
esac
|
||||||
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
|
(eval "$ac_compile") 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } && {
|
||||||
|
test -z "$ac_cxx_werror_flag" ||
|
||||||
|
test ! -s conftest.err
|
||||||
|
} && test -s conftest.$ac_objext; then
|
||||||
|
ac_cv_header_hash_map=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
ac_cv_header_hash_map=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
|
||||||
|
if test $ac_cv_header_hash_map = yes; then
|
||||||
|
{ echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5
|
||||||
|
echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; }
|
||||||
|
if test "${wx_cv_class_stdhashmapset+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <hash_map>
|
||||||
|
#include <hash_set>
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
|
||||||
|
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (ac_try="$ac_compile"
|
||||||
|
case "(($ac_try" in
|
||||||
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
*) ac_try_echo=$ac_try;;
|
||||||
|
esac
|
||||||
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
|
(eval "$ac_compile") 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } && {
|
||||||
|
test -z "$ac_cxx_werror_flag" ||
|
||||||
|
test ! -s conftest.err
|
||||||
|
} && test -s conftest.$ac_objext; then
|
||||||
|
wx_cv_class_stdhashmapset=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
wx_cv_class_stdhashmapset=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
|
||||||
|
echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if test "$wx_cv_class_stdhashmapset" = yes; then
|
||||||
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
#define HAVE_HASH_MAP 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
#define HAVE_STD_HASH_MAP 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for ext/hash_map" >&5
|
||||||
|
echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
|
||||||
|
if test "${ac_cv_header_ext_hash_map+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include <ext/hash_map>
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (ac_try="$ac_compile"
|
||||||
|
case "(($ac_try" in
|
||||||
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
*) ac_try_echo=$ac_try;;
|
||||||
|
esac
|
||||||
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
|
(eval "$ac_compile") 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } && {
|
||||||
|
test -z "$ac_cxx_werror_flag" ||
|
||||||
|
test ! -s conftest.err
|
||||||
|
} && test -s conftest.$ac_objext; then
|
||||||
|
ac_cv_header_ext_hash_map=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
ac_cv_header_ext_hash_map=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
|
||||||
|
if test $ac_cv_header_ext_hash_map = yes; then
|
||||||
|
{ echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
|
||||||
|
echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
|
||||||
|
if test "${wx_cv_class_gnuhashmapset+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <ext/hash_map>
|
||||||
|
#include <ext/hash_set>
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
|
||||||
|
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (ac_try="$ac_compile"
|
||||||
|
case "(($ac_try" in
|
||||||
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
|
*) ac_try_echo=$ac_try;;
|
||||||
|
esac
|
||||||
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
|
(eval "$ac_compile") 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } && {
|
||||||
|
test -z "$ac_cxx_werror_flag" ||
|
||||||
|
test ! -s conftest.err
|
||||||
|
} && test -s conftest.$ac_objext; then
|
||||||
|
wx_cv_class_gnuhashmapset=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
wx_cv_class_gnuhashmapset=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
|
||||||
|
echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
77
configure.in
77
configure.in
@ -1914,42 +1914,6 @@ if test "$wxUSE_STL" = "yes"; then
|
|||||||
AC_DEFINE(HAVE_STD_STRING_COMPARE)
|
AC_DEFINE(HAVE_STD_STRING_COMPARE)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl check for hash_map and hash_set headers
|
|
||||||
AC_CHECK_HEADER([hash_map],
|
|
||||||
[AC_CACHE_CHECK([for standard hash_map and hash_set],
|
|
||||||
wx_cv_class_stdhashmapset,
|
|
||||||
[AC_TRY_COMPILE([#include <hash_map>
|
|
||||||
#include <hash_set>],
|
|
||||||
[std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
|
|
||||||
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
|
|
||||||
wx_cv_class_stdhashmapset=yes,
|
|
||||||
wx_cv_class_stdhashmapset=no)
|
|
||||||
]
|
|
||||||
)],
|
|
||||||
[],
|
|
||||||
[ ]
|
|
||||||
)
|
|
||||||
|
|
||||||
if test "$wx_cv_class_stdhashmapset" = yes; then
|
|
||||||
AC_DEFINE(HAVE_HASH_MAP)
|
|
||||||
AC_DEFINE(HAVE_STD_HASH_MAP)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CHECK_HEADER([ext/hash_map],
|
|
||||||
[AC_CACHE_CHECK([for GNU hash_map and hash_set],
|
|
||||||
wx_cv_class_gnuhashmapset,
|
|
||||||
[AC_TRY_COMPILE([#include <ext/hash_map>
|
|
||||||
#include <ext/hash_set>],
|
|
||||||
[__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
|
|
||||||
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
|
|
||||||
wx_cv_class_gnuhashmapset=yes,
|
|
||||||
wx_cv_class_gnuhashmapset=no)
|
|
||||||
]
|
|
||||||
)],
|
|
||||||
[],
|
|
||||||
[ ]
|
|
||||||
)
|
|
||||||
|
|
||||||
if test "$wx_cv_class_gnuhashmapset" = yes; then
|
if test "$wx_cv_class_gnuhashmapset" = yes; then
|
||||||
AC_DEFINE(HAVE_EXT_HASH_MAP)
|
AC_DEFINE(HAVE_EXT_HASH_MAP)
|
||||||
AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
|
AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
|
||||||
@ -1993,8 +1957,45 @@ if test "$wxUSE_STL" = "yes"; then
|
|||||||
)
|
)
|
||||||
|
|
||||||
if test "$wx_cv_class_tr1unorderedmapset" = yes; then
|
if test "$wx_cv_class_tr1unorderedmapset" = yes; then
|
||||||
AC_DEFINE(HAVE_TR1_UNORDERED_MAP)
|
AC_DEFINE(HAVE_TR1_UNORDERED_MAP)
|
||||||
AC_DEFINE(HAVE_TR1_UNORDERED_SET)
|
AC_DEFINE(HAVE_TR1_UNORDERED_SET)
|
||||||
|
else
|
||||||
|
dnl check for hash_map and hash_set headers
|
||||||
|
AC_CHECK_HEADER([hash_map],
|
||||||
|
[AC_CACHE_CHECK([for std::hash_map and hash_set],
|
||||||
|
wx_cv_class_stdhashmapset,
|
||||||
|
[AC_TRY_COMPILE([#include <hash_map>
|
||||||
|
#include <hash_set>],
|
||||||
|
[std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
|
||||||
|
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
|
||||||
|
wx_cv_class_stdhashmapset=yes,
|
||||||
|
wx_cv_class_stdhashmapset=no)
|
||||||
|
]
|
||||||
|
)],
|
||||||
|
[],
|
||||||
|
[ ]
|
||||||
|
)
|
||||||
|
|
||||||
|
if test "$wx_cv_class_stdhashmapset" = yes; then
|
||||||
|
AC_DEFINE(HAVE_HASH_MAP)
|
||||||
|
AC_DEFINE(HAVE_STD_HASH_MAP)
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_HEADER([ext/hash_map],
|
||||||
|
[AC_CACHE_CHECK([for GNU hash_map and hash_set],
|
||||||
|
wx_cv_class_gnuhashmapset,
|
||||||
|
[AC_TRY_COMPILE([#include <ext/hash_map>
|
||||||
|
#include <ext/hash_set>],
|
||||||
|
[__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
|
||||||
|
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
|
||||||
|
wx_cv_class_gnuhashmapset=yes,
|
||||||
|
wx_cv_class_gnuhashmapset=no)
|
||||||
|
]
|
||||||
|
)],
|
||||||
|
[],
|
||||||
|
[ ]
|
||||||
|
)
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user