Make sure that configure process tests are done with the same _REENTRANT
setting as the one actually used when finally building the library.
This commit is contained in:
parent
7d773abe50
commit
1bc490077a
25
acinclude.m4
25
acinclude.m4
@ -110,6 +110,31 @@ CURL_DEF_TOKEN $1
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CONFIGURE_WITH_REENTRANT
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl This macro ensures that configuration tests done
|
||||||
|
dnl after this will execute with preprocessor symbol
|
||||||
|
dnl _REENTRANT defined. This macro also ensures that
|
||||||
|
dnl the generated config file will equally define it.
|
||||||
|
|
||||||
|
AC_DEFUN([CONFIGURE_WITH_REENTRANT], [
|
||||||
|
AC_BEFORE([$0], [AC_PREPROC_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_LINK_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
|
||||||
|
AH_VERBATIM([_REENTRANT],
|
||||||
|
[/* Define _REENTRANT if not already defined */
|
||||||
|
@%:@ifndef _REENTRANT
|
||||||
|
@%:@ define _REENTRANT
|
||||||
|
@%:@endif])
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
[@%:@ifndef _REENTRANT
|
||||||
|
@%:@ define _REENTRANT
|
||||||
|
@%:@endif]
|
||||||
|
_ACEOF
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CHECK_HEADER_WINDOWS
|
dnl CURL_CHECK_HEADER_WINDOWS
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl Check for compilable and valid windows.h header
|
dnl Check for compilable and valid windows.h header
|
||||||
|
@ -88,6 +88,31 @@ CURL_DEF_TOKEN $1
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CONFIGURE_WITH_REENTRANT
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl This macro ensures that configuration tests done
|
||||||
|
dnl after this will execute with preprocessor symbol
|
||||||
|
dnl _REENTRANT defined. This macro also ensures that
|
||||||
|
dnl the generated config file will equally define it.
|
||||||
|
|
||||||
|
AC_DEFUN([CONFIGURE_WITH_REENTRANT], [
|
||||||
|
AC_BEFORE([$0], [AC_PREPROC_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_LINK_IFELSE])dnl
|
||||||
|
AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
|
||||||
|
AH_VERBATIM([_REENTRANT],
|
||||||
|
[/* Define _REENTRANT if not already defined */
|
||||||
|
@%:@ifndef _REENTRANT
|
||||||
|
@%:@ define _REENTRANT
|
||||||
|
@%:@endif])
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
[@%:@ifndef _REENTRANT
|
||||||
|
@%:@ define _REENTRANT
|
||||||
|
@%:@endif]
|
||||||
|
_ACEOF
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CHECK_HEADER_WINDOWS
|
dnl CURL_CHECK_HEADER_WINDOWS
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl Check for compilable and valid windows.h header
|
dnl Check for compilable and valid windows.h header
|
||||||
|
@ -75,6 +75,9 @@ AC_PROG_CC
|
|||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
|
dnl Our configure and build reentrant settings
|
||||||
|
CONFIGURE_WITH_REENTRANT
|
||||||
|
|
||||||
dnl check for how to do large files
|
dnl check for how to do large files
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
|
@ -141,6 +141,9 @@ AC_AIX
|
|||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
|
dnl Our configure and build reentrant settings
|
||||||
|
CONFIGURE_WITH_REENTRANT
|
||||||
|
|
||||||
dnl check for how to do large files
|
dnl check for how to do large files
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user