From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 27 Apr 2022 20:30:43 +0000 (-0500)
Subject: If we use the cache, then we don't populate CPPFLAGS on the cache run...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8912e957935f7d41fc2e141199d77fbd7cd8fd57;p=thirdparty%2Ffreeradius-server.git

If we use the cache, then we don't populate CPPFLAGS on the cache run...
---

diff --git a/configure b/configure
index 7927e01c4d0..8a27c940e2e 100755
--- a/configure
+++ b/configure
@@ -11204,8 +11204,7 @@ printf "%s\n" "$as_me: WARNING: talloc headers not found. Use --with-talloc-incl
   as_fn_error $? "FreeRADIUS requires libtalloc" "$LINENO" 5
 fi
 
-if test "x$ac_cv_header_sys_event_h" != "xyes"; then
-  smart_try_dir="${kqueue_include_dir:-/usr/include/kqueue}"
+smart_try_dir="${kqueue_include_dir:-/usr/include/kqueue}"
 
 
 ac_safe=`echo "sys/event.h" | sed 'y%./+-%__pm%'`
@@ -11436,11 +11435,10 @@ fi
 
 smart_prefix=
 
-  if test "x$ac_cv_header_sys_event_h" != "xyes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: kqueue headers not found. Use --with-kqueue-include-dir=<path>." >&5
+if test "x$ac_cv_header_sys_event_h" != "xyes"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: kqueue headers not found. Use --with-kqueue-include-dir=<path>." >&5
 printf "%s\n" "$as_me: WARNING: kqueue headers not found. Use --with-kqueue-include-dir=<path>." >&2;}
-    as_fn_error $? "FreeRADIUS requires libkqueue (or system kqueue)" "$LINENO" 5
-  fi
+  as_fn_error $? "FreeRADIUS requires libkqueue (or system kqueue)" "$LINENO" 5
 fi
 
 case "$target" in
diff --git a/configure.ac b/configure.ac
index 2fb748058df..4148085075d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1173,13 +1173,11 @@ fi
 dnl #
 dnl # Check for kqueue header files
 dnl #
+smart_try_dir="${kqueue_include_dir:-/usr/include/kqueue}"
+FR_SMART_CHECK_INCLUDE([sys/event.h])
 if test "x$ac_cv_header_sys_event_h" != "xyes"; then
-  smart_try_dir="${kqueue_include_dir:-/usr/include/kqueue}"
-  FR_SMART_CHECK_INCLUDE([sys/event.h])
-  if test "x$ac_cv_header_sys_event_h" != "xyes"; then
-    AC_MSG_WARN([kqueue headers not found. Use --with-kqueue-include-dir=<path>.])
-    AC_MSG_ERROR([FreeRADIUS requires libkqueue (or system kqueue)])
-  fi
+  AC_MSG_WARN([kqueue headers not found. Use --with-kqueue-include-dir=<path>.])
+  AC_MSG_ERROR([FreeRADIUS requires libkqueue (or system kqueue)])
 fi
 
 dnl #