Commit a4b90ae

nsxiva4b90ae

Added HAVE_GIFLIB macro for optional dependency on giflib

+13 −3

3 files changed

−Context 3+

M Makefile View

M Makefile.netbsd View

M image.c View

		@@ -5,7 +5,7 @@ VERSION = git-20110819
5	5		CC = gcc
6	6		DESTDIR =
7	7		PREFIX = /usr/local
8		−	CFLAGS = -Wall -pedantic -O2 -DVERSION=\"$(VERSION)\"
	8	+	CFLAGS = -Wall -pedantic -O2 -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB
9	9		LDFLAGS =
10	10		LIBS = -lX11 -lImlib2 -lgif
11	11

		@@ -1,4 +1,4 @@
1	1		.include "Makefile"
2	2
3		−	CFLAGS = -Wall -pedantic -DVERSION=\"$(VERSION)\" -I/usr/X11R7/include -I/usr/pkg/include
	3	+	CFLAGS = -Wall -pedantic -O2 -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB -I/usr/X11R7/include -I/usr/pkg/include
4	4		LDFLAGS = -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib

		@@ -18,11 +18,14 @@
18	18
19	19		#define _IMAGE_CONFIG
20	20
	21	+	#include <unistd.h>
	22	+
	23	+	#ifdef HAVE_GIFLIB
21	24		#include <stdlib.h>
22	25		#include <string.h>
23		−	#include <unistd.h>
24	26		#include <sys/types.h>
25	27		#include <gif_lib.h>
	28	+	#endif
26	29
27	30		#include "image.h"
28	31		#include "options.h"
		@@ -55,6 +58,7 @@ void img_init(img_t img, win_t win) {
55	58		}
56	59		}
57	60
	61	+	#ifdef HAVE_GIFLIB
58	62		int img_load_gif(img_t img, const fileinfo_t file) {
59	63		GifFileType *gif;
60	64		GifRowType *rows = NULL;
		@@ -208,6 +212,7 @@ int img_load_gif(img_t img, const fileinfo_t file) {
208	212
209	213		return !err;
210	214		}
	215	+	#endif /* HAVE_GIFLIB */
211	216
212	217		int img_load(img_t img, const fileinfo_t file) {
213	218		const char *fmt;
		@@ -225,8 +230,13 @@ int img_load(img_t img, const fileinfo_t file) {
225	230		imlib_context_set_anti_alias(img->aa);
226	231
227	232		fmt = imlib_image_format();
	233	+	#ifdef HAVE_GIFLIB
228	234		if (!strcmp(fmt, "gif"))
229	235		img_load_gif(img, file);
	236	+	#else
	237	+	/* avoid unused-but-set-variable warning */
	238	+	(void) fmt;
	239	+	#endif
230	240
231	241		img->scalemode = options->scalemode;
232	242		img->re = 0;