fltk-config fix.

Fl_Text_Display fix (SF bug #706921)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2952 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CHANGES

@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.4
 
+	- Added a NULL check to Fl_Text_Display (SF Bug #706921).
+	- The fltk-config script placed the LDFLAGS at the wrong
+	  place in the linker options.
 	- Fl_Text_Display didn't draw the outer box in the right
 	  dimensions, so it was invisible.
 	- Fl_Help_Dialog used the same color for links as for

fltk-config.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: fltk-config.in,v 1.12.2.17 2003/01/30 21:38:21 easysw Exp $"
+# "$Id: fltk-config.in,v 1.12.2.18 2003/03/26 00:47:14 easysw Exp $"
 # 
 # FLTK configuration utility.
 #
@@ -53,7 +53,7 @@ POSTBUILD="@POSTBUILD@"
 CFLAGS="@CFLAGS@"
 CXXFLAGS="@CXXFLAGS@"
 LDFLAGS="@LDFLAGS@"
-LDLIBS="@LDFLAGS@ @LIBS@"
+LDLIBS="@LIBS@"
 
 # libraries to link with:
 LIBNAME="@LIBNAME@"
@@ -212,8 +212,8 @@ if test x$use_images = xyes; then
     LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC"
 fi
 
-LDLIBS="$DSOLINK $LDLIBS"
-LDSTATIC="$LDSTATIC"
+LDLIBS="$DSOLINK $LDFLAGS $LDLIBS"
+LDSTATIC="$LDFLAGS $LDSTATIC"
 
 # Answer to user requests
 if test -n "$echo_help"; then
@@ -292,5 +292,5 @@ if test "$echo_libs" = "yes"; then
 fi
 
 #
-# End of "$Id: fltk-config.in,v 1.12.2.17 2003/01/30 21:38:21 easysw Exp $".
+# End of "$Id: fltk-config.in,v 1.12.2.18 2003/03/26 00:47:14 easysw Exp $".
 #

src/Fl_Text_Display.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Display.cxx,v 1.12.2.43 2003/03/17 18:31:16 easysw Exp $"
+// "$Id: Fl_Text_Display.cxx,v 1.12.2.44 2003/03/26 00:47:14 easysw Exp $"
 //
 // Copyright 2001-2003 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -2220,6 +2220,8 @@ static int countlines( const char *string ) {
   const char * c;
   int lineCount = 0;
 
+  if (!string) return 0;
+
   for ( c = string; *c != '\0'; c++ )
     if ( *c == '\n' ) lineCount++;
   return lineCount;
@@ -3044,5 +3046,5 @@ int Fl_Text_Display::handle(int event) {
 
 
 //
-// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.43 2003/03/17 18:31:16 easysw Exp $".
+// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.44 2003/03/26 00:47:14 easysw Exp $".
 //