mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fltk-config check for local invocation and libs (#717)

Browse Source 
This updates the changes done for issues #647 and #656.
This commit is contained in:
Albrecht Schlosser 2023-04-10 22:02:57 +02:00
parent 3835b72e2f
commit f9669b80b9
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fltk-config.in
View File

@ -51,7 +51,16 @@ includedir=@includedir@
libdir=@libdir@
srcdir=@srcdir@
# libraries to link with (must be after 'prefix' stuff)
# BEGIN fltk-config code
# Check for local invocation (in FLTK source folder), and update paths accordingly...
selfdir=`dirname "$0"`
if test -f "$selfdir/FL/Fl_Window.H"; then
includedir="$selfdir"
libdir="$selfdir/lib"
fi
# Libraries to link with (must be after 'prefix' stuff and after check for local invocation)
LIBNAME="@LIBNAME@"
DSONAME="@DSONAME@"
DSOLINK="@DSOLINK@"
@ -61,16 +70,6 @@ SHAREDSUFFIX="@SHAREDSUFFIX@"
CAIROLIBS="@CAIROLIBS@"
GLLIBS="@GLLIBS@"
# BEGIN fltk-config code
selfdir=`dirname "$0"`
# Check for local invocation (in FLTK source folder), and update paths accordingly...
if test -f "$selfdir/FL/Fl_Window.H"; then
includedir="$selfdir"
libdir="$selfdir/lib"
fi
# Check bundled image libraries in source tree
if test -f "$libdir/libfltk_jpeg.a"; then
CFLAGS="-I$includedir/jpeg $CFLAGS"