blob: bd594e395631c1eb4ae5574baaeefb767564e2c5 [file] [log] [blame]
--- Makefile.am.orig 2012-08-08 10:29:20.313862377 +0100
+++ Makefile.am 2012-08-08 10:29:30.793762591 +0100
@@ -5,7 +5,7 @@
#AM_CFLAGS = -DNOT_RUBY
AM_CFLAGS =
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
SUBDIRS = . sample
--- sample/Makefile.am.orig 2012-08-08 11:37:49.813512228 +0100
+++ sample/Makefile.am 2012-08-08 11:38:00.289410756 +0100
@@ -2,7 +2,7 @@
libname = $(top_builddir)/libonig.la
LDADD = $(libname)
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
encode_SOURCES = encode.c
listcap_SOURCES = listcap.c
--- configure.in.orig
+++ configure.in
@@ -23,7 +23,7 @@
AC_ARG_ENABLE(combination-explosion-check,
[ --enable-combination-explosion-check enable combination explosion check],
[comb_expl_check=$enableval])
-if test $comb_expl_check = yes; then
+if test "x$comb_expl_check" = xyes; then
AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
fi
@@ -31,7 +31,7 @@
AC_ARG_ENABLE(crnl-as-line-terminator,
[ --enable-crnl-as-line-terminator enable CR+NL as line terminator],
[crnl_as_line_terminator=$enableval])
-if test $crnl_as_line_terminator = yes; then
+if test "x$crnl_as_line_terminator" = xyes; then
AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
fi