Include headers for OpenSSL init

[freeradius.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 5043e2b..0b75739 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -349,6 +349,9 @@ dnl
 
   AC_TRY_COMPILE([
 $1
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
 #endif
@@ -383,7 +386,7 @@ m4_pushdef([AC_OUTPUT],
 AC_DEFUN([FR_TLS],
 [
     AC_MSG_CHECKING(for TLS)
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main() { return 0; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main(int argc, char *argv[]) { return val = argc; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
     AC_MSG_RESULT($have_tls)
     if test "$have_tls" = "yes"; then
         AC_DEFINE([HAVE_THREAD_TLS],[1],[Define if the compiler supports __thread])
@@ -405,8 +408,6 @@ AC_DEFUN([AC_LIB_READLINE], [
         LIBS="$ORIG_LIBS $TRY_LIB"
         AC_TRY_LINK_FUNC(readline, ac_cv_lib_readline="$TRY_LIB")
         if test -n "$ac_cv_lib_readline"; then
-          LIBREADLINE="$TRY_LIB"
-          AC_SUBST(LIBREADLINE)
           break
         fi
       done
@@ -421,6 +422,7 @@ AC_DEFUN([AC_LIB_READLINE], [
   ])
 
   if test "$ac_cv_lib_readline" != "no"; then
+    LIBREADLINE="$ac_cv_lib_readline"
     AC_DEFINE(HAVE_LIBREADLINE, 1,
               [Define if you have a readline compatible library])
     AC_CHECK_HEADERS(readline.h readline/readline.h)
@@ -435,6 +437,7 @@ AC_DEFUN([AC_LIB_READLINE], [
       AC_CHECK_HEADERS(history.h readline/history.h)
     fi
   fi
+  AC_SUBST(LIBREADLINE)
 ])
 
 AC_INCLUDE(aclocal.m4)