diff --git a/fltk-config.in b/fltk-config.in index d3ddcad3a6e5e9448cde03b4f47e22e295f7e194..ee16204b5d4ba9673d6194109f6efc2b60fb4f61 100644 --- a/fltk-config.in +++ b/fltk-config.in @@ -71,7 +71,6 @@ CAIROLIBS="@CAIROLIBS@" GLLIBS="@GLLIBS@" # Check bundled image libraries in source tree -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" @@ -94,10 +93,10 @@ if test -d "$includedir/FL/images"; then CXXFLAGS="-I$includedir/FL/images $CXXFLAGS" fi -# Cairo support +# Cairo support: *append* CAIROFLAGS if test -n "$CAIROFLAGS"; then - CFLAGS="$CAIROFLAGS $CFLAGS" - CXXFLAGS="$CAIROFLAGS $CXXFLAGS" + CFLAGS="$CFLAGS $CAIROFLAGS" + CXXFLAGS="$CXXFLAGS $CAIROFLAGS" fi usage ()