Author: matt
Date: 2009-09-19 13:27:39 -0700 (Sat, 19 Sep 2009)
New Revision: 6885
Log:
Fixed missing jpeg and z lib when using ldstaticflags. It seems that only two 
commas were in the wrong line... . Sigh. STR 2203

Modified:
   branches/branch-1.1/CHANGES
   branches/branch-1.1/configure.in

Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2009-09-19 19:27:00 UTC (rev 6884)
+++ branches/branch-1.1/CHANGES 2009-09-19 20:27:39 UTC (rev 6885)
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.10
 
+       - Fixed missing jpeg and z lib in static config (STR #2203)
        - Updated the bundled libpng to v1.2.40 (released Sep. 10, 2009)
        - Fixed Fl_Choice contrast with light-on-dark settings (STR #2219)
        - Added Xft2 font lookup table (STR #2215)

Modified: branches/branch-1.1/configure.in
===================================================================
--- branches/branch-1.1/configure.in    2009-09-19 19:27:00 UTC (rev 6884)
+++ branches/branch-1.1/configure.in    2009-09-19 20:27:39 UTC (rev 6885)
@@ -538,8 +538,8 @@
     AC_DEFINE(HAVE_LIBJPEG)
     JPEGINC=""
     JPEG=""
-    IMAGELIBS="-ljpeg $IMAGELIBS",
-    STATICIMAGELIBS="-ljpeg $STATICIMAGELIBS"
+    IMAGELIBS="-ljpeg $IMAGELIBS"
+    STATICIMAGELIBS="-ljpeg $STATICIMAGELIBS",
     if test x$enable_localjpeg = xno; then
        JPEGINC=""
        JPEG=""
@@ -561,8 +561,8 @@
     ZLIBINC=""
     ZLIB=""
     LIBS="-lz $LIBS"
-    IMAGELIBS="-lz $IMAGELIBS",
-    STATICIMAGELIBS="-lz $STATICIMAGELIBS"
+    IMAGELIBS="-lz $IMAGELIBS"
+    STATICIMAGELIBS="-lz $STATICIMAGELIBS",
     if test x$enable_localzlib = xno; then
        ZLIBINC=""
        ZLIB=""

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to