pnmtohex: Optionally use pkg-config for netpbm
As of libnetpbm11 in Debian/Ubuntu, the netpbm header files are no
longer located in the root include directory, but in a netbpm
subdirectory. Fortunately the same version added support for
pkg-config.
Support both old and new systems by using pkg-config, when available.
Reported-by: Helge Deller <deller@gmx.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20230326104232.3099222-1-geert@linux-m68k.org
Tested-by: Helge Deller <deller@gmx.de>
diff --git a/Rules.make b/Rules.make
index 51c4e94..b9a098d 100644
--- a/Rules.make
+++ b/Rules.make
@@ -5,7 +5,7 @@
IFLAGS = -I$(TOPDIR)/include
#DFLAGS = -g
OFLAGS = -O3 -fomit-frame-pointer
-CFLAGS = -Wall -Werror $(IFLAGS) $(DFLAGS) $(OFLAGS)
+CFLAGS += -Wall -Werror $(IFLAGS) $(DFLAGS) $(OFLAGS)
SRCS += $(wildcard *.c)
OBJS += $(subst .c,.o,$(SRCS))
diff --git a/pnmtohex/Makefile b/pnmtohex/Makefile
index d89c8e4..642a26f 100644
--- a/pnmtohex/Makefile
+++ b/pnmtohex/Makefile
@@ -3,9 +3,12 @@
HOST_TARGET = pnmtohex
+CFLAGS += $(shell pkg-config --exists netpbm && pkg-config --cflags netpbm)
+
# Modern distro's (e.g. Debian, Fedora Core) seem to have -lnetpbm only
#LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
LIBS += -lnetpbm
+LIBS += $(shell pkg-config --exists netpbm && pkg-config --libs netpbm)
include $(TOPDIR)/Rules.make
