[Gnash-commit] gnash ./ChangeLog ./README ./configure.ac macro...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/27 15:31:18

Modified files:
        .              : ChangeLog README configure.ac 
        macros         : jpeg.m4 
        utilities      : Makefile.am 

Log message:
        * configure.ac: Comment out warnings about FLTK and Xft, these are
        only used by cod eunder develop,ent for now.
        * macros/jpeg.m4: Make sure the head exists, not the lib before
        runing lib tests.
        * utilities/Makefile.am: Add PTHREAD_LIBS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.247&tr2=1.248&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/README.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/jpeg.m4.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.247 gnash/ChangeLog:1.248
--- gnash/ChangeLog:1.247       Thu Apr 27 15:14:07 2006
+++ gnash/ChangeLog     Thu Apr 27 15:31:18 2006
@@ -1,3 +1,12 @@
+2006-04-27 Rob Savoye <address@hidden>
+
+       * configure.ac: Comment out warnings about FLTK and Xft, these are
+       only used by code under develop,ent for now.
+       * macros/jpeg.m4: Make sure the head exists, not the lib before
+       runing lib tests.
+       * utilities/Makefile.am: Add PTHREAD_LIBS.
+
+
 2006-04-27 Bastiaan Jacques <address@hidden>
 
        * server/Key.cpp: Stop using cleanup_listeners(). Use
Index: gnash/README
diff -u gnash/README:1.9 gnash/README:1.10
--- gnash/README:1.9    Thu Apr 20 19:22:41 2006
+++ gnash/README        Thu Apr 27 15:31:18 2006
@@ -118,7 +118,6 @@
 To build Klash, the Konqueror plugin, you need to have the KDE
 development packages installed.
 
-
 The Gnash Community:
 --------------------
 
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.60 gnash/configure.ac:1.61
--- gnash/configure.ac:1.60     Mon Apr 24 23:05:55 2006
+++ gnash/configure.ac  Thu Apr 27 15:31:18 2006
@@ -632,11 +632,11 @@
       echo "        Fltk flags are: default include path"
     fi
       echo "        Fltk libs are: $FLTK_LIBS"
-    else
-      echo "ERROR: No Fltk development package installed!\
- You need to have the fltk development package installed\
- to compile this project or install libfltk1.1-dev \
- (using apt-get) or fltk-devel (using yum)."
+dnl     else
+dnl       echo "ERROR: No Fltk development package installed!\
+dnl  You need to have the fltk development package installed\
+dnl  to compile this project or install libfltk1.1-dev \
+dnl  (using apt-get) or fltk-devel (using yum)."
 dnl    nogo=true
   fi
 fi
@@ -649,11 +649,11 @@
       echo "        Xft flags are: default include path"
     fi
       echo "        Xft libs are: $XFT_LIBS"
-    else
-      echo "ERROR: No Xft development package installed!\
- You need to have the xft development package installed\
- to compile this project or install libxft-dev \
- (using apt-get) or xft-devel (using yum)."
+dnl     else
+dnl       echo "ERROR: No Xft development package installed!\
+dnl  You need to have the xft development package installed\
+dnl  to compile this project or install libxft-dev \
+dnl  (using apt-get) or xft-devel (using yum)."
 dnl    nogo=true
   fi
 fi
Index: gnash/macros/jpeg.m4
diff -u gnash/macros/jpeg.m4:1.10 gnash/macros/jpeg.m4:1.11
--- gnash/macros/jpeg.m4:1.10   Mon Apr 24 23:05:55 2006
+++ gnash/macros/jpeg.m4        Thu Apr 27 15:31:18 2006
@@ -104,7 +104,7 @@
       ])
 
       dnl If the header doesn't exist, there is no point looking for the 
library.
-      if test x"${ac_cv_path_jpeg_lib}" = x; then
+      if test x"${ac_cv_path_jpeg_incl}" = x; then
         AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib=""],[
           AC_MSG_CHECKING([for libjpeg library])
           libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.16 gnash/utilities/Makefile.am:1.17
--- gnash/utilities/Makefile.am:1.16    Thu Mar 30 19:12:53 2006
+++ gnash/utilities/Makefile.am Thu Apr 27 15:31:18 2006
@@ -32,16 +32,17 @@
        ../server/libgnashasobjs.la \
        ../libgeometry/libgnashgeo.la \
        ../libbase/libgnashbase.la \
-       $(LIBXML_LIBS)          \
-       $(JPEG_LIBS)            \
-       $(PNG_LIBS)             \
-        $(OGG_LIBS)            \
-       $(ZLIB_LIBS)            \
-        $(LIBXML_LIBS)         \
-        $(OPENGL_LIBS)         \
-       $(GLEXT_LIBS)           \
-       $(GTK2_LIBS)            \
-       $(MP3_LIBS)
+       $(LIBXML_LIBS) \
+       $(JPEG_LIBS) \
+       $(PNG_LIBS) \
+        $(OGG_LIBS) \
+       $(ZLIB_LIBS) \
+        $(LIBXML_LIBS) \
+        $(OPENGL_LIBS) \
+       $(GLEXT_LIBS) \
+       $(GTK2_LIBS) \
+       $(MP3_LIBS) \
+       $(PTHREAD_LIBS)
 
 INCLUDES = -I.. \
         -I$(top_srcdir)                \