diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-11-20 21:15:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-11-20 21:15:08 +0000 |
| commit | d76c1e8cd0da9699a51042db01ebd67e87b6f9e2 (patch) | |
| tree | fb1fbe22879f37f562b3acd3bdff473cb36bba13 /fltk-config.in | |
| parent | ac3ab91ca2d5a9f02b55e8b5fa15f4bd6db0dc4d (diff) | |
Remove unused variables.
Fix fltk-config --libs and fltk-config --ldstaticflags (STR #1799)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5985 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fltk-config.in')
| -rwxr-xr-x | fltk-config.in | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/fltk-config.in b/fltk-config.in index c073d5020..c7910340e 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -225,17 +225,14 @@ fi # Calculate needed libraries LDSTATIC="$libdir/libfltk.a $LDLIBS" LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" -LIBS="$libdir/libfltk.a" if test x$use_forms = xyes; then LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" - LIBS="$LIBS $libdir/libfltk_forms.a" fi if test x$use_gl = xyes; then LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" - LIBS="$LIBS $libdir/libfltk_gl.a" fi if test x$use_images = xyes; then LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" @@ -243,7 +240,7 @@ if test x$use_images = xyes; then fi LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" -LDSTATIC="$LDFLAGS $libs $LDSTATIC" +LDSTATIC="$LDFLAGS $LDSTATIC" # Answer to user requests if test -n "$echo_help"; then @@ -314,7 +311,25 @@ if test "$echo_ldstaticflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo $LIBS + echo $libdir/libfltk.a + + if test x$use_forms = xyes; then + echo $libdir/libfltk_images.a + fi + + if test x$use_gl = xyes; then + echo $libdir/libfltk_images.a + fi + + if test x$use_images = xyes; then + echo $libdir/libfltk_images.a + + for lib in fltk_jpeg fltk_png fltk_z; do + if test -f $libdir/lib$lib.a; then + echo $libdir/lib$lib.a + fi + done + fi fi # |