fix placement of CHECK_LIBS test for kevent64

dgrove-oss · dgrove-oss · commit 907c677c2ba3 · 2015-12-10T11:55:53.000Z
Need to run this check independent of the check for sys/event64
so that HAVE_KEVENT64 will be checked and defined on all platforms.
diff --git a/configure.ac b/configure.ac
@@ -137,13 +137,12 @@ AC_SEARCH_LIBS(pthread_create, pthread)
 # Prefer native kqueue(2); otherwise use libkqueue if present.
 #
 AC_CHECK_HEADER(sys/event.h, [],
-  [PKG_CHECK_MODULES(KQUEUE, libkqueue)
-   AC_SEARCH_LIBS(kevent, kqueue)
-   AC_SEARCH_LIBS(kevent64, kqueue,
-                 [AC_DEFINE(HAVE_KEVENT64, 1, [Define if kevent64 is present])],
-                 [AC_DEFINE(HAVE_KEVENT64, 0, [Define if kevent64 is present])])]
+  [PKG_CHECK_MODULES(KQUEUE, libkqueue)]
 )
-
+AC_SEARCH_LIBS(kevent, kqueue)
+AC_SEARCH_LIBS(kevent64, kqueue,
+               [AC_DEFINE(HAVE_KEVENT64, 1, [Define if kevent64 is present])],
+               [AC_DEFINE(HAVE_KEVENT64, 0, [Define if kevent64 is present])])
 
 #
 # Checks for header files.

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,12 @@ AC_SEARCH_LIBS(pthread_create, pthread)`
`137`	`137`	`# Prefer native kqueue(2); otherwise use libkqueue if present.`
`138`	`138`	`#`
`139`	`139`	`AC_CHECK_HEADER(sys/event.h, [],`
`140`		`- [PKG_CHECK_MODULES(KQUEUE, libkqueue)`
`141`		`- AC_SEARCH_LIBS(kevent, kqueue)`
`142`		`- AC_SEARCH_LIBS(kevent64, kqueue,`
`143`		`- [AC_DEFINE(HAVE_KEVENT64, 1, [Define if kevent64 is present])],`
`144`		`- [AC_DEFINE(HAVE_KEVENT64, 0, [Define if kevent64 is present])])]`
	`140`	`+ [PKG_CHECK_MODULES(KQUEUE, libkqueue)]`
`145`	`141`	`)`
`146`		`-`
	`142`	`+AC_SEARCH_LIBS(kevent, kqueue)`
	`143`	`+AC_SEARCH_LIBS(kevent64, kqueue,`
	`144`	`+ [AC_DEFINE(HAVE_KEVENT64, 1, [Define if kevent64 is present])],`
	`145`	`+ [AC_DEFINE(HAVE_KEVENT64, 0, [Define if kevent64 is present])])`
`147`	`146`
`148`	`147`	`#`
`149`	`148`	`# Checks for header files.`