Use less Travis buildbot time

[freeradius.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 1dd8ad1..a962cec 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
@@ -391,10 +394,10 @@ AC_DEFUN([FR_TLS],
 ])
 
 
-AC_DEFUN([AC_LIB_READLINE], [
+AC_DEFUN([VL_LIB_READLINE], [
   AC_CACHE_CHECK([for a readline compatible library],
-                 ac_cv_lib_readline, [
-    ORIG_LIBS=$LIBS
+                 vl_cv_lib_readline, [
+    ORIG_LIBS="$LIBS"
     for readline_lib in readline edit editline; do
       for termcap_lib in "" termcap curses ncurses; do
         if test -z "$termcap_lib"; then
@@ -403,38 +406,38 @@ AC_DEFUN([AC_LIB_READLINE], [
           TRY_LIB="-l$readline_lib -l$termcap_lib"
         fi
         LIBS="$ORIG_LIBS $TRY_LIB"
-        AC_TRY_LINK_FUNC(readline, ac_cv_lib_readline="$TRY_LIB")
-        if test -n "$ac_cv_lib_readline"; then
+        AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
+        if test -n "$vl_cv_lib_readline"; then
           LIBREADLINE="$TRY_LIB"
-          AC_SUBST(LIBREADLINE)
           break
         fi
       done
-      if test -n "$ac_cv_lib_readline"; then
+      if test -n "$vl_cv_lib_readline"; then
         break
       fi
     done
-    if test -z "$ac_cv_lib_readline"; then
-      ac_cv_lib_readline="no"
+    if test -z "$vl_cv_lib_readline"; then
+      vl_cv_lib_readline="no"
+      LIBS="$ORIG_LIBS"
     fi
-    LIBS=$ORIG_LIBS
   ])
 
-  if test "$ac_cv_lib_readline" != "no"; then
+  if test "$vl_cv_lib_readline" != "no"; then
     AC_DEFINE(HAVE_LIBREADLINE, 1,
               [Define if you have a readline compatible library])
     AC_CHECK_HEADERS(readline.h readline/readline.h)
     AC_CACHE_CHECK([whether readline supports history],
-                   ac_cv_lib_readline_history, [
-      ac_cv_lib_readline_history="no"
-      AC_TRY_LINK_FUNC(add_history, ac_cv_lib_readline_history="yes")
+                   vl_cv_lib_readline_history, [
+      vl_cv_lib_readline_history="no"
+      AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
     ])
-    if test "$ac_cv_lib_readline_history" = "yes"; then
+    if test "$vl_cv_lib_readline_history" = "yes"; then
       AC_DEFINE(HAVE_READLINE_HISTORY, 1,
                 [Define if your readline library has \`add_history'])
       AC_CHECK_HEADERS(history.h readline/history.h)
     fi
   fi
-])
+  AC_SUBST(LIBREADLINE)
+])dnl
 
 AC_INCLUDE(aclocal.m4)