Author: engelsman
Date: 2010-11-10 13:18:17 -0800 (Wed, 10 Nov 2010)
New Revision: 7813
Log:
Fixed fltk-config to give --use on one line (STR #2408)
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/fltk-config.cmake.in
branches/branch-1.3/fltk-config.in
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2010-11-09 23:32:36 UTC (rev 7812)
+++ branches/branch-1.3/CHANGES 2010-11-10 21:18:17 UTC (rev 7813)
@@ -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
Modified: branches/branch-1.3/fltk-config.cmake.in
===================================================================
--- branches/branch-1.3/fltk-config.cmake.in 2010-11-09 23:32:36 UTC (rev
7812)
+++ branches/branch-1.3/fltk-config.cmake.in 2010-11-10 21:18:17 UTC (rev
7813)
@@ -358,29 +358,28 @@
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
#
Modified: branches/branch-1.3/fltk-config.in
===================================================================
--- branches/branch-1.3/fltk-config.in 2010-11-09 23:32:36 UTC (rev 7812)
+++ branches/branch-1.3/fltk-config.in 2010-11-10 21:18:17 UTC (rev 7813)
@@ -1,7 +1,7 @@
#!/bin/sh
#
# "$Id$"
-#
+#
# FLTK configuration utility.
#
# Copyright 2000-2009 by Bill Spitzak and others.
@@ -143,10 +143,10 @@
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 @@
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
#
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
