From eb9150e0b1ea54e25614bd2ec91b8b6cbe094c04 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 19 Sep 2009 20:27:39 +0000 Subject: [PATCH] Fixed missing jpeg and z lib when using ldstaticflags. It seems that only two commas were in the wrong line... . Sigh. STR 2203 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6885 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + configure.in | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index c1e7fb1be..82b72863e 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/configure.in b/configure.in index 15030a749..af0418e05 100644 --- a/configure.in +++ b/configure.in @@ -538,8 +538,8 @@ AC_CHECK_LIB(jpeg,jpeg_CreateCompress, 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 @@ AC_CHECK_LIB(z,gzgets, 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=""