[Groonga-commit] groonga/groonga at cdb9f8d [master] Stop to check sys/sysmacros on Windows

Back to archive index

Kouhei Sutou null+****@clear*****
Fri Jun 22 11:17:19 JST 2018


Kouhei Sutou	2018-06-22 11:17:19 +0900 (Fri, 22 Jun 2018)

  New Revision: cdb9f8d0fdc29d022c99736ae0164c42a758eb24
  https://github.com/groonga/groonga/commit/cdb9f8d0fdc29d022c99736ae0164c42a758eb24

  Message:
    Stop to check sys/sysmacros on Windows
    
    It's for avoiding false negative.

  Modified files:
    CMakeLists.txt
    configure.ac

  Modified: CMakeLists.txt (+3 -1)
===================================================================
--- CMakeLists.txt    2018-06-22 10:52:11 +0900 (20a20f8ac)
+++ CMakeLists.txt    2018-06-22 11:17:19 +0900 (7dc602047)
@@ -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)

  Modified: configure.ac (+7 -3)
===================================================================
--- configure.ac    2018-06-22 10:52:11 +0900 (dcdbaf982)
+++ configure.ac    2018-06-22 11:17:19 +0900 (8fac20231)
@@ -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
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180622/8fbed9bf/attachment.htm 



More information about the Groonga-commit mailing list
Back to archive index