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

Modified the gmtime_r check to not check for it until the "check for a working 

one" is made, and only if that test runs ok we define it as present. Unless
crosscompiling, since then we use the former AC_CHECK_FUNCS method.
parent aaace2e8

configure.ac

+28 −24
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ else 
  dnl is there a strerror_r()

  CURL_CHECK_STRERROR_R()



  AC_CHECK_FUNCS( gmtime_r )

  checkfor_gmtime_r="yes"

fi



dnl for recent AIX versions, we skip all the thread-safe checks above since
@@ -1290,15 +1290,18 @@ if test "x$RECENTAIX" = "xyes"; then 
  dnl is there a strerror_r()

  CURL_CHECK_STRERROR_R()



  AC_CHECK_FUNCS( gmtime_r )

  checkfor_gmtime_r="yes"

fi



if test x$cross_compiling != xyes; then



  if test x$checkfor_gmtime_r = xyes; then



    dnl if gmtime_r was found, verify that it actuall works, as (at least) HPUX

    dnl 10.20 is known to have a buggy one. If it doesn't work, disable use of

    dnl it.



  AC_MSG_CHECKING([if gmtime_r works])

    AC_MSG_CHECKING([if gmtime_r exists and works])

    AC_RUN_IFELSE([[

    #include <time.h>

    int main(void)
@@ -1317,16 +1320,17 @@ if test x$cross_compiling != xyes; then 
     ]],

     dnl success, do nothing

     AC_MSG_RESULT(yes)

     AC_DEFINE(HAVE_GMTIME_R, 1, [if you have (a working) gmtime_r])

     ,

     dnl failure, now disable the function

     AC_MSG_RESULT(no)

   ac_cv_func_gmtime_r="no"

   AC_DEFINE(HAVE_GMTIME_R, 0, [if you have gmtime_r])

    ,

    dnl not invoked when crosscompiling)

    ])

 



  fi

else

  dnl and for crosscompilings

  AC_CHECK_FUNCS(gmtime_r)

fi