remove include windows.h from oniguruma.h

[onig] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9e412d65ce7e88185edd6acaab10ac2d8ba0b288..9546fc54758cfb111a34f62676248acd5fd24063 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(onig, 5.9.6)
+AC_INIT(onig, 6.7.1)
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([-Wno-portability 1.14])
+AC_CONFIG_HEADER(src/config.h)
 
 
-dnl default value for RUBYDIR
-RUBYDIR=".."
-AC_ARG_WITH(rubydir,
-       [  --with-rubydir=RUBYDIR  specify value for RUBYDIR (default ..)], 
-       [ RUBYDIR=$withval ])
-AC_SUBST(RUBYDIR)
-
 dnl default value for STATISTICS
 STATISTICS=""
 AC_ARG_WITH(statistics,
@@ -23,7 +16,7 @@ AC_SUBST(STATISTICS)
 
 dnl check for COMBINATION_EXPLOSION
 AC_ARG_ENABLE(combination-explosion-check,
-       [  --enable-combination-explosion-check   enable combination explosion check],
+       [  --enable-combination-explosion-check   deprecated],
        [comb_expl_check=$enableval])
 if test "${comb_expl_check}" = yes; then
   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
@@ -31,7 +24,7 @@ fi
 
 dnl check for CRNL_AS_LINE_TERMINATOR
 AC_ARG_ENABLE(crnl-as-line-terminator,
-       [  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
+       [  --enable-crnl-as-line-terminator   deprecated],
        [crnl_as_line_terminator=$enableval])
 if test "${crnl_as_line_terminator}" = yes; then
   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
@@ -41,7 +34,7 @@ fi
 dnl Checks for programs.
 AC_PROG_CC
 AM_PROG_LIBTOOL
-LTVERSION="2:0:0"
+LTVERSION="4:0:0"
 AC_SUBST(LTVERSION)
 
 AC_PROG_INSTALL
@@ -51,7 +44,7 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(stdlib.h string.h strings.h sys/time.h unistd.h sys/times.h)
+AC_CHECK_HEADERS(stdlib.h string.h strings.h limits.h sys/time.h unistd.h sys/times.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_SIZEOF(int, 4)
@@ -91,4 +84,4 @@ if test "$_cv_stdarg" = yes; then
 fi
 
 
-AC_OUTPUT([Makefile onig-config sample/Makefile], [chmod +x onig-config])
+AC_OUTPUT([Makefile src/Makefile test/Makefile sample/Makefile onig-config], [chmod +x onig-config])