From dd87dcf2b037ec9bab55b137497e446b2cf92cf3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 15 Nov 2010 20:34:31 +0000 Subject: [PATCH] Fixed multiple line output of fltk-config --libs (STR #2408) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@7849 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + fltk-config.in | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2f510ec62..2e22acba6 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,7 @@ CHANGES IN FLTK 1.1.11 - Fixed mouse wheel related crash in GLUT emulation (STR #2381) - Fixed missing architecture flags in OS X build (STR #2303) - Fixed menu and shortcut handling (STR #2243) + - Fixed multiple line output of fltk-config --libs (STR #2408) CHANGES IN FLTK 1.1.10 diff --git a/fltk-config.in b/fltk-config.in index 5b86b33f9..940d74289 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -318,25 +318,27 @@ if test "$echo_ldstaticflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo $libdir/libfltk.a + USELIBS="$libdir/libfltk.a" if test x$use_forms = xyes; then - echo $libdir/libfltk_forms.a + USELIBS="$libdir/libfltk_forms.a $USELIBS" fi if test x$use_gl = xyes; then - echo $libdir/libfltk_gl.a + USELIBS="$libdir/libfltk_gl.a $USELIBS" fi if test x$use_images = xyes; then - echo $libdir/libfltk_images.a + USELIBS="$libdir/libfltk_images.a $USELIBS" for lib in fltk_jpeg fltk_png fltk_z; do if test -f $libdir/lib$lib.a; then - echo $libdir/lib$lib.a + USELIBS="$libdir/lib$lib.a $USELIBS" fi done fi + + echo $USELIBS fi #