generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

With this change Solaris target builds will now be done with _REENTRANT defined.

Browse Source
This commit is contained in:
Yang Tse 2008-10-14 18:44:27 +00:00
parent e16bccbb91
commit 6047635406
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ares/m4/cares-reentrant.m4
View File

@ -16,7 +16,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 2 # serial 3
dnl Note 1 dnl Note 1
dnl ------ dnl ------
@ -333,9 +333,6 @@ dnl makes several _r functions compiler visible.
dnl Internal macro for CARES_CONFIGURE_REENTRANT. dnl Internal macro for CARES_CONFIGURE_REENTRANT.
AC_DEFUN([CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R], [ AC_DEFUN([CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R], [
#
tmp_need_reentrant="no"
#
if test "$tmp_need_reentrant" = "no"; then if test "$tmp_need_reentrant" = "no"; then
CARES_CHECK_NEED_REENTRANT_GMTIME_R CARES_CHECK_NEED_REENTRANT_GMTIME_R
fi fi
@ -366,6 +363,24 @@ AC_DEFUN([CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R], [
]) ])
dnl CARES_CHECK_NEED_REENTRANT_SYSTEM
dnl -------------------------------------------------
dnl Checks if the preprocessor _REENTRANT definition
dnl must be unconditionally done for this platform.
dnl Internal macro for CARES_CONFIGURE_REENTRANT.
AC_DEFUN([CARES_CHECK_NEED_REENTRANT_SYSTEM], [
case $host in
*-*-solaris*)
tmp_need_reentrant="yes"
;;
*)
tmp_need_reentrant="no"
;;
esac
])
dnl CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT dnl CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT
dnl ------------------------------------------------- dnl -------------------------------------------------
dnl This macro ensures that configuration tests done dnl This macro ensures that configuration tests done
@ -421,7 +436,10 @@ AC_DEFUN([CARES_CONFIGURE_REENTRANT], [
# #
if test "$tmp_reentrant_initially_defined" = "no"; then if test "$tmp_reentrant_initially_defined" = "no"; then
AC_MSG_CHECKING([if _REENTRANT is actually needed]) AC_MSG_CHECKING([if _REENTRANT is actually needed])
CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R CARES_CHECK_NEED_REENTRANT_SYSTEM
if test "$tmp_need_reentrant" = "no"; then
CARES_CHECK_NEED_REENTRANT_FUNCTIONS_R
fi
if test "$tmp_need_reentrant" = "yes"; then if test "$tmp_need_reentrant" = "yes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else

28
m4/curl-reentrant.m4
View File

@ -22,7 +22,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 2 # serial 3
dnl Note 1 dnl Note 1
dnl ------ dnl ------
@ -339,9 +339,6 @@ dnl makes several _r functions compiler visible.
dnl Internal macro for CURL_CONFIGURE_REENTRANT. dnl Internal macro for CURL_CONFIGURE_REENTRANT.
AC_DEFUN([CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R], [ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R], [
#
tmp_need_reentrant="no"
#
if test "$tmp_need_reentrant" = "no"; then if test "$tmp_need_reentrant" = "no"; then
CURL_CHECK_NEED_REENTRANT_GMTIME_R CURL_CHECK_NEED_REENTRANT_GMTIME_R
fi fi
@ -372,6 +369,24 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R], [
]) ])
dnl CURL_CHECK_NEED_REENTRANT_SYSTEM
dnl -------------------------------------------------
dnl Checks if the preprocessor _REENTRANT definition
dnl must be unconditionally done for this platform.
dnl Internal macro for CURL_CONFIGURE_REENTRANT.
AC_DEFUN([CURL_CHECK_NEED_REENTRANT_SYSTEM], [
case $host in
*-*-solaris*)
tmp_need_reentrant="yes"
;;
*)
tmp_need_reentrant="no"
;;
esac
])
dnl CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT dnl CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT
dnl ------------------------------------------------- dnl -------------------------------------------------
dnl This macro ensures that configuration tests done dnl This macro ensures that configuration tests done
@ -427,7 +442,10 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
# #
if test "$tmp_reentrant_initially_defined" = "no"; then if test "$tmp_reentrant_initially_defined" = "no"; then
AC_MSG_CHECKING([if _REENTRANT is actually needed]) AC_MSG_CHECKING([if _REENTRANT is actually needed])
CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R CURL_CHECK_NEED_REENTRANT_SYSTEM
if test "$tmp_need_reentrant" = "no"; then
CURL_CHECK_NEED_REENTRANT_FUNCTIONS_R
fi
if test "$tmp_need_reentrant" = "yes"; then if test "$tmp_need_reentrant" = "yes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else