links

Commit: a7afa5beca1584254655462eaff18b22701f8b6c
Parent: bf6ec37c41823d5da95a4c423116cf1107e94849
Author: opask
Date:   Wed, 29 Aug 2018 12:18:27 -0600

config.mk cleanup JPEG and PNG defines

Diffstat:
M
config.mk
 | 
4
+---
M
links.h
 | 
4
----

2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/config.mk b/config.mk
@@ -11,7 +11,5 @@ LIBS = -L$(X11LIB) -L/usr/lib -lX11 -levent -lpng -ljpeg -lcrypto -lssl -lz
 
 CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE
 CFLAGS = -O2 -std=c99 -Wall -pedantic $(CPPFLAGS) \
-	-DG=1 \
-	-DHAVE_JPEG=1 -DHAVE_LIBJPEG=1 -DHAVE_JPEGLIB_H=1 \
-	-DHAVE_PNG_H=1 -DHAVE_LIBPNG=1 -DHAVE_LIBPNG_PNG_H=1
+	-DG=1 -DHAVE_JPEG=1 -DHAVE_PNG_H=1
 LDFLAGS = $(LIBS) $(INCS)
diff --git a/links.h b/links.h
@@ -52,11 +52,7 @@
 
 #if defined(G)
 #if defined(HAVE_PNG_H)
-#define PNG_THREAD_UNSAFE_OK
 #include <png.h>
-#elif defined(HAVE_LIBPNG_PNG_H)
-#define PNG_THREAD_UNSAFE_OK
-#include <libpng/png.h>
 #endif /* #if defined(HAVE_PNG_H) */
 #ifndef png_jmpbuf
 #define png_jmpbuf(png_ptr)	((png_ptr)->jmpbuf)