diff options
author | Kevin Ryde <user42@zip.com.au> | 2003-12-19 22:25:02 +0100 |
---|---|---|
committer | Kevin Ryde <user42@zip.com.au> | 2003-12-19 22:25:02 +0100 |
commit | dfb89a385d7a459ecec2caf6686f4bf98a064921 (patch) | |
tree | cfee7bc13e031395749d88f484f76f2c467d8608 /configure | |
parent | 899b2b72b58beddd193d8f3c81d9fd3973add9db (diff) | |
download | gmp-dfb89a385d7a459ecec2caf6686f4bf98a064921.tar.gz |
Regenerate for:
* configure.in (AC_PREREQ): Require autoconf 2.59.
(AM_INIT_AUTOMAKE): Require automake 1.8.
(AC_C_INLINE): Use rather than GMP_C_INLINE, now has #ifndef
__cplusplus we want.
(gettimeofday): Use AC_CHECK_FUNCS rather than our workaround code,
autoconf now ok.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 128 |
1 files changed, 25 insertions, 103 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.607 . +# From configure.in Revision: 1.608 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for GNU MP 4.1. # @@ -25303,11 +25303,11 @@ fi echo "$as_me:$LINENO: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${gmp_cv_c_inline+set}" = set; then +if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - gmp_cv_c_inline=no -for i in inline __inline__ __inline; do + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25316,16 +25316,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -$i foo_t func1 () { return 0; } -static $i foo_t func2 () { return 0; } +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif -int -main () -{ - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -25349,8 +25343,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gmp_cv_c_inline=$i - break + ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -25358,29 +25351,29 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done -if test $gmp_cv_c_inline = inline; then - gmp_cv_c_inline=yes -fi fi -echo "$as_me:$LINENO: result: $gmp_cv_c_inline" >&5 -echo "${ECHO_T}$gmp_cv_c_inline" >&6 +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 -case $gmp_cv_c_inline in +case $ac_cv_c_inline in inline | yes) ;; - no) cat >>confdefs.h <<\_ACEOF -#define inline -_ACEOF - ;; - *) cat >>confdefs.h <<_ACEOF -#define inline $gmp_cv_c_inline + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif _ACEOF - ;; + ;; esac -case $gmp_cv_c_inline in +case $ac_cv_c_inline in no) ;; *) cat >conftest.$ac_ext <<_ACEOF @@ -25436,9 +25429,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -case $gmp_cv_c_inline in +case $ac_cv_c_inline in yes) tmp_inline=inline ;; - *) tmp_inline=$gmp_cv_c_inline ;; + *) tmp_inline=$ac_cv_c_inline ;; esac { echo "$as_me:$LINENO: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&5 echo "$as_me: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&2;} @@ -26500,7 +26493,8 @@ esac -for ac_func in alarm attr_get clock clock_gettime cputime getpagesize getrusage getsysinfo localeconv memset mmap mprotect nl_langinfo obstack_vprintf popen processor_info pstat_getprocessor raise read_real_time sigaction sigaltstack sigstack syssgi strchr strerror strnlen strtol strtoul sysconf sysctl sysctlbyname times + +for ac_func in alarm attr_get clock clock_gettime cputime getpagesize getrusage gettimeofday getsysinfo localeconv memset mmap mprotect nl_langinfo obstack_vprintf popen processor_info pstat_getprocessor raise read_real_time sigaction sigaltstack sigstack syssgi strchr strerror strnlen strtol strtoul sysconf sysctl sysctlbyname times do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -26602,78 +26596,6 @@ fi done -# The following is a workaround for a known bug in autoconf 2.57 -# AC_CHECK_FUNCS. The test generated by that macro uses <limits.h>, but on -# HP-UX that file gives a prototype for gettimeofday (among others) which -# conflicts with the one autoconf gives. -# -# FIXME: Autoconf post 2.57 has its own fix for this, so when we upgrade -# gettimeofday can just go in the AC_CHECK_FUNCS above. -# -echo "$as_me:$LINENO: checking for gettimeofday" >&5 -echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 -if test "${ac_cv_func_gettimeofday+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. */ -char gettimeofday(); -char (*f) () = gettimeofday; -int -main () -{ -return f != gettimeofday; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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_exeext' - { (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_func_gettimeofday=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gettimeofday=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5 -echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 -if test "$ac_cv_func_gettimeofday" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF - -fi - echo "$as_me:$LINENO: checking for vsnprintf" >&5 echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6 |