feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merged changes from RC_1_29_0.

Browse Source 
[SVN r15960]
This commit is contained in:
John Maddock
2002-10-21 11:05:10 +00:00
parent 9ec9927674
commit 7302ec29fe
4 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
configure vendored
View File

@@ -1801,9 +1801,9 @@ fi
echo "$as_me:$LINENO: checking for main in -lpthread" >&5 echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_main+set}" = set; then if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -1812,7 +1812,13 @@ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char pthread_exit ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
@@ -1822,7 +1828,7 @@ cat >conftest.$ac_ext <<_ACEOF
int int
main () main ()
{ {
main (); pthread_exit ();
; ;
return 0; return 0;
} }
@@ -1839,18 +1845,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_pthread_main=yes ac_cv_lib_pthread_pthread_exit=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
ac_cv_lib_pthread_main=no ac_cv_lib_pthread_pthread_exit=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6
if test $ac_cv_lib_pthread_main = yes; then if test $ac_cv_lib_pthread_pthread_exit = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREAD 1 #define HAVE_LIBPTHREAD 1
_ACEOF _ACEOF
@@ -1858,12 +1864,11 @@ _ACEOF
LIBS="-lpthread $LIBS" LIBS="-lpthread $LIBS"
fi fi
ac_cv_lib_pthread=ac_cv_lib_pthread_main
echo "$as_me:$LINENO: checking for main in -lm" >&5 echo "$as_me:$LINENO: checking for cos in -lm" >&5
echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6
if test "${ac_cv_lib_m_main+set}" = set; then if test "${ac_cv_lib_m_cos+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -1872,7 +1877,13 @@ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char cos ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
@@ -1882,7 +1893,7 @@ cat >conftest.$ac_ext <<_ACEOF
int int
main () main ()
{ {
main (); cos ();
; ;
return 0; return 0;
} }
@@ -1899,18 +1910,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_m_main=yes ac_cv_lib_m_cos=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
ac_cv_lib_m_main=no ac_cv_lib_m_cos=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
echo "${ECHO_T}$ac_cv_lib_m_main" >&6 echo "${ECHO_T}$ac_cv_lib_m_cos" >&6
if test $ac_cv_lib_m_main = yes; then if test $ac_cv_lib_m_cos = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1 #define HAVE_LIBM 1
_ACEOF _ACEOF
@@ -1918,12 +1929,11 @@ _ACEOF
LIBS="-lm $LIBS" LIBS="-lm $LIBS"
fi fi
ac_cv_lib_m=ac_cv_lib_m_main
echo "$as_me:$LINENO: checking for main in -lrt" >&5 echo "$as_me:$LINENO: checking for clock in -lrt" >&5
echo $ECHO_N "checking for main in -lrt... $ECHO_C" >&6 echo $ECHO_N "checking for clock in -lrt... $ECHO_C" >&6
if test "${ac_cv_lib_rt_main+set}" = set; then if test "${ac_cv_lib_rt_clock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -1932,7 +1942,13 @@ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char clock ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
@@ -1942,7 +1958,7 @@ cat >conftest.$ac_ext <<_ACEOF
int int
main () main ()
{ {
main (); clock ();
; ;
return 0; return 0;
} }
@@ -1959,18 +1975,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_rt_main=yes ac_cv_lib_rt_clock=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
ac_cv_lib_rt_main=no ac_cv_lib_rt_clock=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_rt_main" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock" >&5
echo "${ECHO_T}$ac_cv_lib_rt_main" >&6 echo "${ECHO_T}$ac_cv_lib_rt_clock" >&6
if test $ac_cv_lib_rt_main = yes; then if test $ac_cv_lib_rt_clock = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRT 1 #define HAVE_LIBRT 1
_ACEOF _ACEOF
@@ -1978,7 +1994,6 @@ _ACEOF
LIBS="-lrt $LIBS" LIBS="-lrt $LIBS"
fi fi
ac_cv_lib_rt=ac_cv_lib_rt_main
# #
@@ -2369,7 +2384,9 @@ cat > user.hpp << EOF
// setup is fully ISO complient, and has no // setup is fully ISO complient, and has no
// useful extentions, or for autoconf generated // useful extentions, or for autoconf generated
// setups: // setups:
#define BOOST_NO_CONFIG #ifndef BOOST_NO_CONFIG
# define BOOST_NO_CONFIG
#endif
// define if you want to disable threading support, even // define if you want to disable threading support, even
@@ -3036,3 +3053,5 @@ fi

4
test/boost_has_long_long.ipp
View File

@@ -14,8 +14,8 @@ namespace boost_has_long_long{
int test() int test()
{ {
long long int lli = 0LL; long long lli = 0LL;
unsigned long long int ulli = 0uLL; unsigned long long ulli = 0uLL;
(void)lli; (void)lli;
(void)ulli; (void)ulli;
return 0; return 0;

22
test/boost_no_wchar_t.ipp
View File

@@ -18,18 +18,18 @@
namespace boost_no_intrinsic_wchar_t{ namespace boost_no_intrinsic_wchar_t{
template <class T> template <class T>
struct is_int{}; struct is_int{ int i; };
template <> struct is_int<unsigned char>{}; template <> struct is_int<unsigned char>{ int i; };
template <> struct is_int<signed char>{}; template <> struct is_int<signed char>{ int i; };
template <> struct is_int<char>{}; template <> struct is_int<char>{ int i; };
template <> struct is_int<unsigned short>{}; template <> struct is_int<unsigned short>{ int i; };
template <> struct is_int<short>{}; template <> struct is_int<short>{ int i; };
template <> struct is_int<unsigned int>{}; template <> struct is_int<unsigned int>{ int i; };
template <> struct is_int<int>{}; template <> struct is_int<int>{ int i; };
template <> struct is_int<unsigned long>{}; template <> struct is_int<unsigned long>{ int i; };
template <> struct is_int<long>{}; template <> struct is_int<long>{ int i; };
template <> struct is_int<wchar_t>{}; template <> struct is_int<wchar_t>{ int i; };
int test() int test()
{ {

12
tools/configure.in
View File

@@ -129,9 +129,9 @@ fi
dnl check for some standard libraries dnl check for some standard libraries
dnl without these some of the tests may fail: dnl without these some of the tests may fail:
AC_HAVE_LIBRARY(pthread) AC_CHECK_LIB(pthread, pthread_exit)
AC_HAVE_LIBRARY(m) AC_CHECK_LIB(m, cos)
AC_HAVE_LIBRARY(rt) AC_CHECK_LIB(rt, clock)
# #
# enumerate test files and test each one: # enumerate test files and test each one:
@@ -345,7 +345,9 @@ cat > user.hpp << EOF
// setup is fully ISO complient, and has no // setup is fully ISO complient, and has no
// useful extentions, or for autoconf generated // useful extentions, or for autoconf generated
// setups: // setups:
#define BOOST_NO_CONFIG #ifndef BOOST_NO_CONFIG
# define BOOST_NO_CONFIG
#endif
// define if you want to disable threading support, even // define if you want to disable threading support, even
@@ -413,3 +415,5 @@ fi