mirror of https://github.com/google/snappy.git
Fix public issue #7: Don't use internal variables named ac_*, as those belong
to autoconf's namespace. R=csilvers DELTA=6 (0 added, 0 deleted, 6 changed) Revision created by MOE tool push_codebase. MOE_MIGRATION=988 git-svn-id: https://snappy.googlecode.com/svn/trunk@6 03e5f5b5-db94-4691-08a0-1a8bf15f6143
This commit is contained in:
parent
46e39fb20c
commit
79752dd703
|
@ -15038,19 +15038,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_expect=yes
|
||||
snappy_have_builtin_expect=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_expect=no
|
||||
snappy_have_builtin_expect=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_expect = xyes ; then
|
||||
if test x$snappy_have_builtin_expect = xyes ; then
|
||||
|
||||
$as_echo "@%:@define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
|
||||
|
||||
|
@ -15076,19 +15076,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_ctz=yes
|
||||
snappy_have_builtin_ctz=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_ctz=no
|
||||
snappy_have_builtin_ctz=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_ctz = xyes ; then
|
||||
if test x$snappy_have_builtin_ctz = xyes ; then
|
||||
|
||||
$as_echo "@%:@define HAVE_BUILTIN_CTZ 1" >>confdefs.h
|
||||
|
||||
|
|
|
@ -15034,19 +15034,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_expect=yes
|
||||
snappy_have_builtin_expect=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_expect=no
|
||||
snappy_have_builtin_expect=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_expect = xyes ; then
|
||||
if test x$snappy_have_builtin_expect = xyes ; then
|
||||
|
||||
$as_echo "@%:@define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
|
||||
|
||||
|
@ -15072,19 +15072,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_ctz=yes
|
||||
snappy_have_builtin_ctz=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_ctz=no
|
||||
snappy_have_builtin_ctz=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_ctz = xyes ; then
|
||||
if test x$snappy_have_builtin_ctz = xyes ; then
|
||||
|
||||
$as_echo "@%:@define HAVE_BUILTIN_CTZ 1" >>confdefs.h
|
||||
|
||||
|
|
|
@ -15034,19 +15034,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_expect=yes
|
||||
snappy_have_builtin_expect=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_expect=no
|
||||
snappy_have_builtin_expect=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_expect = xyes ; then
|
||||
if test x$snappy_have_builtin_expect = xyes ; then
|
||||
|
||||
$as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
|
||||
|
||||
|
@ -15072,19 +15072,19 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
|
||||
ac_have_builtin_ctz=yes
|
||||
snappy_have_builtin_ctz=yes
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
else
|
||||
|
||||
ac_have_builtin_ctz=no
|
||||
snappy_have_builtin_ctz=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
if test x$ac_have_builtin_ctz = xyes ; then
|
||||
if test x$snappy_have_builtin_ctz = xyes ; then
|
||||
|
||||
$as_echo "#define HAVE_BUILTIN_CTZ 1" >>confdefs.h
|
||||
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -33,13 +33,13 @@ AC_MSG_CHECKING([if the compiler supports __builtin_expect])
|
|||
AC_TRY_COMPILE(, [
|
||||
return __builtin_expect(1, 1) ? 1 : 0
|
||||
], [
|
||||
ac_have_builtin_expect=yes
|
||||
snappy_have_builtin_expect=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
], [
|
||||
ac_have_builtin_expect=no
|
||||
snappy_have_builtin_expect=no
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
if test x$ac_have_builtin_expect = xyes ; then
|
||||
if test x$snappy_have_builtin_expect = xyes ; then
|
||||
AC_DEFINE(HAVE_BUILTIN_EXPECT, 1, [Define to 1 if the compiler supports __builtin_expect.])
|
||||
fi
|
||||
|
||||
|
@ -50,13 +50,13 @@ AC_MSG_CHECKING([if the compiler supports __builtin_ctzll])
|
|||
AC_TRY_COMPILE(, [
|
||||
return (__builtin_ctzll(0x100000000LL) == 32) ? 1 : 0
|
||||
], [
|
||||
ac_have_builtin_ctz=yes
|
||||
snappy_have_builtin_ctz=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
], [
|
||||
ac_have_builtin_ctz=no
|
||||
snappy_have_builtin_ctz=no
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
if test x$ac_have_builtin_ctz = xyes ; then
|
||||
if test x$snappy_have_builtin_ctz = xyes ; then
|
||||
AC_DEFINE(HAVE_BUILTIN_CTZ, 1, [Define to 1 if the compiler supports __builtin_ctz and friends.])
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue