From 7864ea636dbc271a2d66da71542639226e341d5c Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser <albrechts.fltk@online.de> Date: Tue, 21 Jan 2025 15:08:13 +0100 Subject: [PATCH] fltk-config: fix "Check bundled image libraries in source tree" Avoid adding a non-existent folder to include directories (-I) in `fltk-config --cxxflags` etc. --- fltk-config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fltk-config.in b/fltk-config.in index dee2cf008..d3ddcad3a 100644 --- a/fltk-config.in +++ b/fltk-config.in @@ -71,17 +71,18 @@ CAIROLIBS="@CAIROLIBS@" GLLIBS="@GLLIBS@" # Check bundled image libraries in source tree -if test -f "$libdir/libfltk_jpeg.a"; then +echo "--- includedir='$includedir' ---" +if test -f "$libdir/libfltk_jpeg.a" -a -d $includedir/jpeg; then CFLAGS="-I$includedir/jpeg $CFLAGS" CXXFLAGS="-I$includedir/jpeg $CXXFLAGS" fi -if test -f "$libdir/libfltk_z.a"; then +if test -f "$libdir/libfltk_z.a" -a -d $includedir/zlib; then CFLAGS="-I$includedir/zlib $CFLAGS" CXXFLAGS="-I$includedir/zlib $CXXFLAGS" fi -if test -f "$libdir/libfltk_png.a"; then +if test -f "$libdir/libfltk_png.a" -a -d $includedir/png; then CFLAGS="-I$includedir/png $CFLAGS" CXXFLAGS="-I$includedir/png $CXXFLAGS" fi -- GitLab