Commit b9e5302f authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

adjusted the strerror_r test more, use _REENTRANT instead of _THREAD_SAFE 

when looking for the prototype
parent dd7b6aef

acinclude.m4

+11 −22
Original line number Original line Diff line number Diff line
@@ -417,36 +417,25 @@ dnl int strerror_r(int errnum, char *buf, size_t n); 
dnl

dnl

AC_DEFUN([CURL_CHECK_STRERROR_R],

AC_DEFUN([CURL_CHECK_STRERROR_R],

[

[

  dnl determine of strerror_r is present

  AC_CHECK_FUNCS(strerror_r)

  AC_CHECK_FUNC(strerror_r,



    strerror_r="yes",

  if test "x$ac_cv_func_strerror_r" = "xyes"; then

    [



    AC_MSG_CHECKING(whether strerror_r is declared)

    AC_MSG_CHECKING(whether strerror_r is declared)

    AC_EGREP_CPP(strerror_r,[

    AC_EGREP_CPP(strerror_r,[

#include <string.h>],[

#include <string.h>],[

      strerror_r="yes"

      AC_MSG_RESULT(yes)],[

      AC_MSG_RESULT(yes)],[

      AC_MSG_RESULT(no)

      AC_MSG_RESULT(no)

      AC_MSG_CHECKING(whether strerror_r with -D_THREAD_SAFE is declared)

      AC_MSG_CHECKING(whether strerror_r with -D_REENTRANT is declared)

      AC_EGREP_CPP(strerror_r,[

      AC_EGREP_CPP(strerror_r,[

#define _THREAD_SAFE

#define _REENTRANT

#include <string.h>],[

#include <string.h>],[

        strerror_r="yes"

	CPPFLAGS="-D_REENTRANT $CPPFLAGS"

	CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"

	AC_MSG_RESULT(yes)],

	AC_MSG_RESULT(yes)],

	AC_MSG_RESULT(no))])])

	AC_MSG_RESULT(no)



  if test "x$strerror_r" = "xyes"; then



    dnl check if strerror_r is properly declared in the headers

    AC_CHECK_DECL(strerror_r, ,

        AC_DEFINE(HAVE_NO_STRERROR_R_DECL, 1, [we have no strerror_r() proto])

        AC_DEFINE(HAVE_NO_STRERROR_R_DECL, 1, [we have no strerror_r() proto])

,

       ) dnl with _THREAD_SAFE

[#include <stdlib.h>

    ]) dnl plain cpp for it

#include <stdio.h>

#include <string.h>

#include <errno.h>

])





    dnl determine if this strerror_r() is glibc or POSIX

    dnl determine if this strerror_r() is glibc or POSIX

    AC_MSG_CHECKING([for a glibc strerror_r API])

    AC_MSG_CHECKING([for a glibc strerror_r API])