diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-05-05 11:58:28 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-05-05 11:58:28 +0000 |
| commit | e6d24aefcb5cb57e052ec5fcd7af2cb9d1aabbce (patch) | |
| tree | 977c1d5ef1c670413b6aaf56a1fe7f67e34a2168 /usr.sbin/httpd | |
| parent | ed6b0dd01e67f4f86ed999c2df2e704b885260f2 (diff) | |
Unconditionally set HAVE_ISINF and HAVE_ISNAN in the generated
ap_config_auto.h. We know we have these functions in libc on OpenBSD, but
the check for them fails with gcc due to some __builtin__xxx stupidity.
ok drahn@, sthen@, henning@
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/src/Configure | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure index 4447623f70a..62b8d1aebd7 100644 --- a/usr.sbin/httpd/src/Configure +++ b/usr.sbin/httpd/src/Configure @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: Configure,v 1.28 2008/05/09 08:06:27 mbalmer Exp $ +# $OpenBSD: Configure,v 1.29 2010/05/05 11:58:27 kettenis Exp $ ## ==================================================================== ## The Apache Software License, Version 1.1 ## @@ -2356,38 +2356,17 @@ fi ## ## Check for availability of isinf() and isnan() ## -if ${SHELL} ./helpers/TestCompile func isinf ; then - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: isinf() found in libc */ " >>$AP_CONFIG_AUTO_H - echo "#ifndef HAVE_ISINF" >>$AP_CONFIG_AUTO_H - echo "#define HAVE_ISINF 1" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H -elif ${SHELL} ./helpers/TestCompile lib m isinf ; then - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: isinf() found in libm */ " >>$AP_CONFIG_AUTO_H - echo "#ifndef HAVE_ISINF" >>$AP_CONFIG_AUTO_H - echo "#define HAVE_ISINF 1" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H - LIBS="$LIBS -lm" - ADDED_LM="yes" -fi +echo "" >>$AP_CONFIG_AUTO_H +echo "/* determine: isinf() found in libc */ " >>$AP_CONFIG_AUTO_H +echo "#ifndef HAVE_ISINF" >>$AP_CONFIG_AUTO_H +echo "#define HAVE_ISINF 1" >>$AP_CONFIG_AUTO_H +echo "#endif" >>$AP_CONFIG_AUTO_H -if ${SHELL} ./helpers/TestCompile func isnan ; then - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: isnan() found in libc */ " >>$AP_CONFIG_AUTO_H - echo "#ifndef HAVE_ISNAN" >>$AP_CONFIG_AUTO_H - echo "#define HAVE_ISNAN 1" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H -elif ${SHELL} ./helpers/TestCompile lib m isnan ; then - echo "" >>$AP_CONFIG_AUTO_H - echo "/* determine: isnan() found in libm */ " >>$AP_CONFIG_AUTO_H - echo "#ifndef HAVE_ISNAN" >>$AP_CONFIG_AUTO_H - echo "#define HAVE_ISNAN 1" >>$AP_CONFIG_AUTO_H - echo "#endif" >>$AP_CONFIG_AUTO_H - if [ "x$ADDED_LM" != "xyes" ]; then - LIBS="$LIBS -lm" - fi -fi +echo "" >>$AP_CONFIG_AUTO_H +echo "/* determine: isnan() found in libc */ " >>$AP_CONFIG_AUTO_H +echo "#ifndef HAVE_ISNAN" >>$AP_CONFIG_AUTO_H +echo "#define HAVE_ISNAN 1" >>$AP_CONFIG_AUTO_H +echo "#endif" >>$AP_CONFIG_AUTO_H ## ## Now compare the sizes of off_t to long |