Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 2e108d2

Browse files
hughbeakoeplinger
authored andcommitted
Fix warnings running autogen.sh (#581)
1 parent 478f11b commit 2e108d2

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

autogen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ do
131131
shift
132132
done
133133

134-
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
134+
conf_flags="--enable-maintainer-mode"
135135

136136
if test x$NOCONFIGURE = x; then
137137
echo Running $srcdir/configure $conf_flags $CONF_OPTIONS ...

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
3131
# Optional use of Pango's text rendering on top of Cairo
3232
AC_ARG_WITH(pango, [ --with-pango use Pango to measure and draw text],[text_v=pango],[text_v=default])
3333

34-
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -std=gnu99"
34+
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -std=gnu11"
3535

3636
AC_ARG_ENABLE(warnaserror, AS_HELP_STRING([--enable-warnaserror],[Enable treating warnings as errors.]),[warnaserror=yes],[warnaserror=no])
3737

3838
if test $warnaserror = "yes"; then
39-
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered -Wno-typedef-redefinition"
39+
GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered"
4040
fi
4141

4242
AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],[Enable address sanitizer.]),[asan=yes],[asan=no])

tests/Makefile.am

+17-18
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LIBS = $(GDIPLUS_LIBS)
44

55
AM_CPPFLAGS = \
66
-I$(top_srcdir) \
7-
-I$(top_builddir)/src \
7+
-I$(top_builddir)/src \
88
-I$(top_srcdir)/src \
99
$(GDIPLUS_CFLAGS)
1010

@@ -306,7 +306,22 @@ EXTRA_DIST = \
306306
$(testtexturebrush_SOURCES) \
307307
$(testtext_SOURCES) \
308308
$(testtiffcodec_SOURCES) \
309-
$(testwmfcodec_SOURCES)
309+
$(testwmfcodec_SOURCES) \
310+
AdobeRGB1998.icc \
311+
test-gsa.png \
312+
test-trns.png \
313+
test.bmp \
314+
test.emf \
315+
test.gif \
316+
test.ico \
317+
test.jpg \
318+
test.otf \
319+
test.png \
320+
test.tif \
321+
test.ttf \
322+
test.wmf \
323+
testhelpers.h \
324+
$(NULL)
310325

311326
# $(testgdi_SOURCES)
312327

@@ -352,19 +367,3 @@ TESTS = \
352367
if HAVE_X11
353368
# TESTS += testgdi
354369
endif
355-
356-
EXTRA_DIST = \
357-
AdobeRGB1998.icc \
358-
test-gsa.png \
359-
test-trns.png \
360-
test.bmp \
361-
test.emf \
362-
test.gif \
363-
test.ico \
364-
test.jpg \
365-
test.otf \
366-
test.png \
367-
test.tif \
368-
test.ttf \
369-
test.wmf \
370-
testhelpers.h

0 commit comments

Comments
 (0)