diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-04-10 22:02:57 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-04-10 22:02:57 +0200 |
| commit | f9669b80b95fea8d7f6426340c5616ed46e90daa (patch) | |
| tree | 4eb098d5cf8919e72e03dd3d6bbacd5d2de735ec | |
| parent | 3835b72e2faefc4ace3784805630a885d5921042 (diff) | |
Fix fltk-config check for local invocation and libs (#717)
This updates the changes done for issues #647 and #656.
| -rw-r--r-- | fltk-config.in | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/fltk-config.in b/fltk-config.in index 8ac758bde..0e4044492 100644 --- a/fltk-config.in +++ b/fltk-config.in @@ -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" |