Fixed fltk-config to give --use on one line (STR #2408)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7813 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Nov 10, 2010 · db8d989 · db8d989
1 parent d9be6bb
commit db8d989
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.3.0
 
+	- Fixed fltk-config to give --libs on one line (STR #2408)
 	- Fixed tab key navigation to inactive widgets (STR #2420)
 	- Fixed outside label redraw damage areas (STR #2436)
 	- Added callback when double-clicking file in a file chooser

diff --git a/fltk-config.cmake.in b/fltk-config.cmake.in
@@ -358,29 +358,28 @@ if test "$echo_ldstaticflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-    echo $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_cairo = xyes; then
-        echo $libdir/libfltk_cairo.a
+        USELIBS="$libdir/libfltk_cairo.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
 
 #

diff --git a/fltk-config.in b/fltk-config.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # "$Id$"
-# 
+#
 # FLTK configuration utility.
 #
 # Copyright 2000-2009 by Bill Spitzak and others.
@@ -143,10 +143,10 @@ post=
 debug=
 
 # Parse command line options
-while test $# -gt 0 
+while test $# -gt 0
 do
     case "$1" in
-	-*=*) 
+	-*=*)
 	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
 	    ;;
 	*)
@@ -358,29 +358,31 @@ 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_cairo = xyes; then
-        echo $libdir/libfltk_cairo.a
+        USELIBS="$libdir/libfltk_cairo.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
 
 #