Fix CUPS_VERSION_MAJOR typo and add CUPS_CFLAGS to tests and pkg-config (#158)

Author: rkt0209

Makefile.am

@@ -246,13 +246,17 @@ testcmyk_SOURCES = \
 testcmyk_LDADD = \
 	libcupsfilters.la \
 	-lm
+testcmyk_CFLAGS = \
+	$(CUPS_CFLAGS)
 
 testdither_SOURCES = \
 	cupsfilters/testdither.c \
 	$(pkgfiltersinclude_DATA)
 testdither_LDADD = \
 	libcupsfilters.la \
 	-lm
+testdither_CFLAGS = \
+	$(CUPS_CFLAGS)
 
 testimage_SOURCES = \
 	cupsfilters/testimage.c \
@@ -266,14 +270,17 @@ testimage_LDADD = \
 testimage_CFLAGS = \
 	$(LIBJPEG_CFLAGS) \
 	$(LIBPNG_CFLAGS) \
-	$(TIFF_CFLAGS)
+	$(TIFF_CFLAGS) \
+	$(CUPS_CFLAGS)
 
 testrgb_SOURCES = \
 	cupsfilters/testrgb.c \
 	$(pkgfiltersinclude_DATA)
 testrgb_LDADD = \
 	libcupsfilters.la \
 	-lm
+testrgb_CFLAGS = \
+	$(CUPS_CFLAGS)
 
 test1284_SOURCES = \
 	cupsfilters/test1284.c
@@ -289,7 +296,8 @@ testpdf1_SOURCES = \
 	cupsfilters/fontembed-private.h
 testpdf1_CFLAGS = \
 	-I$(srcdir)/cupsfilters/fontembed/ \
-	-I$(srcdir)/cupsfilters/
+	-I$(srcdir)/cupsfilters/ \
+	$(CUPS_CFLAGS)
 testpdf1_LDADD = \
 	libcupsfilters.la
 
@@ -298,18 +306,22 @@ testpdf2_SOURCES = \
 	cupsfilters/fontembed-private.h
 testpdf2_CFLAGS = \
 	-I$(srcdir)/cupsfilters/fontembed/ \
-	-I$(srcdir)/cupsfilters/
+	-I$(srcdir)/cupsfilters/ \
+	$(CUPS_CFLAGS)
 testpdf2_LDADD = \
 	libcupsfilters.la
 
 test_analyze_SOURCES = cupsfilters/fontembed/test-analyze.c
 test_analyze_LDADD = libcupsfilters.la
+test_analyze_CFLAGS = $(CUPS_CFLAGS)
 
 test_pdf_SOURCES = cupsfilters/fontembed/test-pdf.c
 test_pdf_LDADD = libcupsfilters.la
+test_pdf_CFLAGS = $(CUPS_CFLAGS)
 
 test_ps_SOURCES = cupsfilters/fontembed/test-ps.c
 test_ps_LDADD = libcupsfilters.la
+test_ps_CFLAGS = $(CUPS_CFLAGS)
 
 testfilters_SOURCES = \
 	cupsfilters/testfilters.c \

cupsfilters/testfilters.c

@@ -9,7 +9,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#  if CUPS_VERISON_MAJOR < 3 /* CUPS 2.x and older */
+#  if CUPS_VERSION_MAJOR < 3 /* CUPS 2.x and older */
 /* Functions changed in libcups3 */
 #    define cupsArrayGetCount      cupsArrayCount
 #    define cupsArrayGetFirst      cupsArrayFirst

libcupsfilters.pc.in

@@ -9,4 +9,4 @@ Version: @VERSION@
 
 Libs: -L${libdir} -lcupsfilters
 Libs.private: @CUPS_LIBS@ @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBTIFF_LIBS@ @LIBPDFIO_LIBS@
-Cflags: -I${includedir}/cupsfilters -I${includedir}
+Cflags: -I${includedir}/cupsfilters -I${includedir} @CUPS_CFLAGS@