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

4 files changed, 34 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index e001e73b4..6ee748b25 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ CHANGES IN FLTK 1.1.8
 	  STR #1457, STR #1458, STR #1460, STR #1481, STR #1578,
 	  STR #1639, STR #1645, STR #1644, STR #1792, STR #1793,
 	  STR #1742, STR #1777)
+	- "fltk-config --use-* --libs" did not list all of the
+	  dependent libraries (STR #1799)
 	- Hiding a nested window on WIN32 caused 100% CPU (STR #1748)
 	- Changing the window size in FLUID would not mark the 
 	  project as modified (STR #1751)
diff --git a/Makefile b/Makefile
index 27e7fb3d1..be1381750 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2006 by Bill Spitzak and others.
+# Copyright 1998-2007 by Bill Spitzak and others.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -29,7 +29,7 @@ include makeinclude
 
 DIRS	=	$(IMAGEDIRS) src fluid test documentation
 
-all: makeinclude
+all: makeinclude fltk-config
 	for dir in $(DIRS); do\
 		echo "=== making $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -90,6 +90,16 @@ distclean: clean
 		$(RM) test/`basename $$file .fl`.h; \
 	done
 
+fltk-config: configure configh.in fltk-config.in
+	if test -f config.status; then \
+		./config.status --recheck; \
+		./config.status; \
+	else \
+		./configure; \
+	fi
+	touch config.h
+	chmod +x fltk-config
+
 makeinclude: configure configh.in makeinclude.in
 	if test -f config.status; then \
 		./config.status --recheck; \
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
 
 #
diff --git a/src/Fl_Check_Browser.cxx b/src/Fl_Check_Browser.cxx
index 799d09cbb..a95feabee 100644
--- a/src/Fl_Check_Browser.cxx
+++ b/src/Fl_Check_Browser.cxx
@@ -195,8 +195,6 @@ int Fl_Check_Browser::add(char *s, int b) {
 
 int Fl_Check_Browser::remove(int item) {
   cb_item *p = find_item(item);
-  cb_item *prev;
-  cb_item *next;
   
   // line at item exists
   if(p) {