X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=9701afc644ff73284379cfcd3324f5fa7070e183;hb=d4bd55e7d9b1cf63cd6fdc96b70010a0c2aca963;hp=f292c3e40d0c331cb4423d5905522fa3b6768752;hpb=4174d499fe105c6d8bd76d265e28e07f0db08b55;p=m6w6%2Fext-psi

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index f292c3e..9701afc 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -12,7 +12,7 @@ AC_DEFUN(PSI_CONFIG_INIT, [
 	AC_PROG_AWK
 	
 	AC_MSG_CHECKING(for preprocessor defaults)
-	psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null`
+	psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -U__BLOCKS__ - </dev/null`
 	psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null 2>&1 >/dev/null \
 		| $AWK '
 			/include.*search.*start/ { 
@@ -50,6 +50,7 @@ AC_DEFUN(PSI_CONFIG_INIT, [
 	if test "$PHP_PSI_MAINTAINER_MODE" = "yes"; then
 		PSI_DEPS=true
 		PHP_SUBST(PSI_DEPS)
+		EXTRA_CFLAGS="-Wall -Wextra $EXTRA_CFLAGS"
 	else
 		PSI_DEPS=false
 	fi
@@ -194,23 +195,6 @@ typedef bool _Bool;
 #endif
 ])
 
-dnl PSI_LEMON()
-dnl Declare $LEMON precious, and check for a `lemon` in $PATH.
-AC_DEFUN(PSI_LEMON, [
-	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
-	if test -z "$LEMON"
-	then
-		AC_PATH_PROG(LEMON, lemon, $PHP_PSI_BUILDDIR/lemon)
-		if expr + "$LEMON" : "/" >/dev/null; then
-			LEMON_PATH=
-		else
-			LEMON_PATH=$abs_builddir/
-		fi
-	fi
-	PHP_SUBST(LEMON_PATH)
-	PHP_SUBST(LEMON)
-])
-
 dnl PSI_PKG_CONFIG()
 dnl Check for `pkg-config` and add possible libjit and libffi directories to
 dnl $PKG_CONFIG_PATH, because those libs often ship with headers etc. in