Fix include issue for gpmmon and gpsmon

Author: wangzw

contrib/perfmon/src/gpmmon/Makefile

@@ -4,7 +4,7 @@ MODULE_big = gpmmon
 OBJS = gpmmon.o gpmondb.o gpmon_agg.o  ../common/gpmonlib.o
 SHLIB_LINK += -levent  -lapr-1 -laprutil-1 -lm
 PG_CFLAGS += -Wno-error=vla -Wno-vla
-PG_CPPFLAGS = -I$(libpq_srcdir) -I../include
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../include $(apr_includes)
 SHLIB_LINK_INTERNAL = -Wl,-Bsymbolic -Wl,-Bstatic -Wl,-Bstatic $(libpq) -lpgcommon_shlib -Wl,-Bdynamic
 
 ifdef USE_PGXS

contrib/perfmon/src/gpsmon/Makefile

@@ -1,6 +1,6 @@
 top_builddir = ../../../..
 
-PG_CPPFLAGS = -I$(libpq_srcdir) -I../include -I. -Wno-error=vla -Wno-vla
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../include -I. $(apr_includes) -Wno-error=vla -Wno-vla -Wno-unused-result
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)