configure.ac: Don't use gcc_AC_C_LONG_LONG.
2005-05-24 Kelley Cook <kcook@gcc.gnu.org> * configure.ac: Don't use gcc_AC_C_LONG_LONG. Check for existence of long long and __int64 before determining their size. * aclocal.m4: Delete gcc_AC_C_LONG_LONG. * configure, config.h.in: Regenerate. From-SVN: r100131
This commit is contained in:
parent
150de50631
commit
5ec1c5e69b
|
@ -1,3 +1,10 @@
|
|||
2005-05-24 Kelley Cook <kcook@gcc.gnu.org>
|
||||
|
||||
* configure.ac: Don't use gcc_AC_C_LONG_LONG. Check for
|
||||
existence of long long and __int64 before determining their size.
|
||||
* aclocal.m4: Delete gcc_AC_C_LONG_LONG.
|
||||
* configure, config.h.in: Regenerate.
|
||||
|
||||
2005-05-24 Kelley Cook <kcook@gcc.gnu.org>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
|
|
@ -408,29 +408,6 @@ else
|
|||
fi
|
||||
fi])
|
||||
|
||||
dnl Checking for long long.
|
||||
dnl By Caolan McNamara <caolan@skynet.ie>
|
||||
dnl Added check for __int64, Zack Weinberg <zackw@stanford.edu>
|
||||
dnl
|
||||
AC_DEFUN([gcc_AC_C_LONG_LONG],
|
||||
[AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
|
||||
[AC_TRY_COMPILE(,[long long int i;],
|
||||
ac_cv_c_long_long=yes,
|
||||
ac_cv_c_long_long=no)])
|
||||
if test $ac_cv_c_long_long = yes; then
|
||||
AC_DEFINE(HAVE_LONG_LONG, 1,
|
||||
[Define if your compiler supports the \`long long' type.])
|
||||
fi
|
||||
AC_CACHE_CHECK(for __int64, ac_cv_c___int64,
|
||||
[AC_TRY_COMPILE(,[__int64 i;],
|
||||
ac_cv_c___int64=yes,
|
||||
ac_cv_c___int64=no)])
|
||||
if test $ac_cv_c___int64 = yes; then
|
||||
AC_DEFINE(HAVE___INT64, 1,
|
||||
[Define if your compiler supports the \`__int64' type.])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_DEFUN([AM_LANGINFO_CODESET],
|
||||
|
|
|
@ -866,7 +866,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
/* Define if your compiler supports the \`long long' type. */
|
||||
/* Define to 1 if the system has the type `long long'. */
|
||||
#ifndef USED_FOR_TARGET
|
||||
#undef HAVE_LONG_LONG
|
||||
#endif
|
||||
|
@ -1137,7 +1137,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
/* Define if your compiler supports the \`__int64' type. */
|
||||
/* Define to 1 if the system has the type `__int64'. */
|
||||
#ifndef USED_FOR_TARGET
|
||||
#undef HAVE___INT64
|
||||
#endif
|
||||
|
|
|
@ -3175,128 +3175,6 @@ _ACEOF
|
|||
esac
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for long long int" >&5
|
||||
echo $ECHO_N "checking for long long int... $ECHO_C" >&6
|
||||
if test "${ac_cv_c_long_long+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. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
long long int i;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_c_long_long=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_c_long_long=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_c_long_long" >&5
|
||||
echo "${ECHO_T}$ac_cv_c_long_long" >&6
|
||||
if test $ac_cv_c_long_long = yes; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_LONG_LONG 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: checking for __int64" >&5
|
||||
echo $ECHO_N "checking for __int64... $ECHO_C" >&6
|
||||
if test "${ac_cv_c___int64+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. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
__int64 i;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_c___int64=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_c___int64=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_c___int64" >&5
|
||||
echo "${ECHO_T}$ac_cv_c___int64" >&6
|
||||
if test $ac_cv_c___int64 = yes; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE___INT64 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# sizeof(char) is 1 by definition.
|
||||
|
||||
echo "$as_me:$LINENO: checking for egrep" >&5
|
||||
|
@ -5208,8 +5086,69 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
if test $ac_cv_c_long_long = yes; then
|
||||
echo "$as_me:$LINENO: checking for long long" >&5
|
||||
echo "$as_me:$LINENO: checking for long long" >&5
|
||||
echo $ECHO_N "checking for long long... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_long_long+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. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if ((long long *) 0)
|
||||
return 0;
|
||||
if (sizeof (long long))
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_type_long_long=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_type_long_long=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
|
||||
echo "${ECHO_T}$ac_cv_type_long_long" >&6
|
||||
if test $ac_cv_type_long_long = yes; then
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LONG_LONG 1
|
||||
_ACEOF
|
||||
|
||||
echo "$as_me:$LINENO: checking for long long" >&5
|
||||
echo $ECHO_N "checking for long long... $ECHO_C" >&6
|
||||
if test "${ac_cv_type_long_long+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
|
@ -5624,8 +5563,70 @@ _ACEOF
|
|||
|
||||
|
||||
fi
|
||||
if test $ac_cv_c___int64 = yes; then
|
||||
echo "$as_me:$LINENO: checking for __int64" >&5
|
||||
|
||||
echo "$as_me:$LINENO: checking for __int64" >&5
|
||||
echo $ECHO_N "checking for __int64... $ECHO_C" >&6
|
||||
if test "${ac_cv_type___int64+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. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
if ((__int64 *) 0)
|
||||
return 0;
|
||||
if (sizeof (__int64))
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_type___int64=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_type___int64=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
|
||||
echo "${ECHO_T}$ac_cv_type___int64" >&6
|
||||
if test $ac_cv_type___int64 = yes; then
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE___INT64 1
|
||||
_ACEOF
|
||||
|
||||
echo "$as_me:$LINENO: checking for __int64" >&5
|
||||
echo $ECHO_N "checking for __int64... $ECHO_C" >&6
|
||||
if test "${ac_cv_type___int64+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
|
@ -6041,6 +6042,7 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
|
||||
# ---------------------
|
||||
# Warnings and checking
|
||||
# ---------------------
|
||||
|
@ -7400,7 +7402,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
|
|||
else
|
||||
ac_prog_version=`$MAKEINFO --version 2>&1 |
|
||||
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
|
||||
echo "configure:7403: version of makeinfo is $ac_prog_version" >&5
|
||||
echo "configure:7405: version of makeinfo is $ac_prog_version" >&5
|
||||
case $ac_prog_version in
|
||||
'') gcc_cv_prog_makeinfo_modern=no;;
|
||||
4.[2-9]*)
|
||||
|
|
|
@ -283,19 +283,13 @@ AC_SUBST(OUTPUT_OPTION)
|
|||
AC_PROG_CPP
|
||||
AC_C_INLINE
|
||||
|
||||
gcc_AC_C_LONG_LONG
|
||||
|
||||
# sizeof(char) is 1 by definition.
|
||||
AC_CHECK_SIZEOF(void *)
|
||||
AC_CHECK_SIZEOF(short)
|
||||
AC_CHECK_SIZEOF(int)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
if test $ac_cv_c_long_long = yes; then
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
fi
|
||||
if test $ac_cv_c___int64 = yes; then
|
||||
AC_CHECK_SIZEOF(__int64)
|
||||
fi
|
||||
AC_CHECK_TYPES([long long], [AC_CHECK_SIZEOF(long long)])
|
||||
AC_CHECK_TYPES([__int64], [AC_CHECK_SIZEOF(__int64)])
|
||||
|
||||
# ---------------------
|
||||
# Warnings and checking
|
||||
|
|
Loading…
Reference in New Issue