Navigation Menu

Skip to content

Commit

Permalink
Stop to check sys/sysmacros on Windows
Browse files Browse the repository at this point in the history
It's for avoiding false negative.
  • Loading branch information
kou committed Jun 22, 2018
1 parent 5c8c764 commit cdb9f8d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Expand Up @@ -636,7 +636,9 @@ endif()
set(MRUBY_DEFINITIONS "MRB_INT64" "HAVE_ONIGMO_H")

# For mruby-file-stat
ac_check_headers(sys/sysmacros.h)
if(NOT WIN32)
ac_check_headers(sys/sysmacros.h)
endif()

# TODO: Support using system Onigmo instead of bundled Onigmo.
set(GRN_WITH_ONIGMO ON)
Expand Down
10 changes: 7 additions & 3 deletions configure.ac
Expand Up @@ -1570,9 +1570,13 @@ MRUBY_CPPFLAGS="-DMRB_INT64"
AC_SUBST(MRUBY_CPPFLAGS)

# For mruby-file-stat
AC_CHECK_HEADERS(sys/sysmacros.h,
[HAVE_SYS_SYSMACROS_H=yes],
[HAVE_SYS_SYSMACROS_H=no])
if test "$os_win32" = "yes"; then
HAVE_SYS_SYSMACROS_H=no
else
AC_CHECK_HEADERS(sys/sysmacros.h,
[HAVE_SYS_SYSMACROS_H=yes],
[HAVE_SYS_SYSMACROS_H=no])
fi
AM_CONDITIONAL(HAVE_SYS_SYSMACROS_H, test "$HAVE_SYS_SYSMACROS_H" = "yes")

# This option is used in vendor/onigmo/configure
Expand Down

0 comments on commit cdb9f8d

Please sign in to comment.