[Gnash-commit] gnash configure.ac ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/05/12 04:51:33

Modified files:
        .              : configure.ac ChangeLog 

Log message:
        * configure.ac: Print a warning, not an error if Cairo or
        SDL_Mixer aren't installed. For bug #16560.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.308&tr2=1.309&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.308 gnash/ChangeLog:1.309
--- gnash/ChangeLog:1.308       Fri May 12 04:28:11 2006
+++ gnash/ChangeLog     Fri May 12 04:51:33 2006
@@ -1,5 +1,9 @@
 2006-05-12 Rob Savoye <address@hidden>
 
+       * configure.ac: Print a warning, not an error if Cairo or
+       SDL_Mixer aren't installed. For bug #16560.
+       * gui/*: Update to latest version of the Mozilla exemption.
+       
        * configure.ac: Use AC_CONFIG_SRCDIR, and add the version number
        to AC_INIT. Define conditional for KDE. Add partial support to use
        kde and fltk as configure options to --enable-gui. Comment out
@@ -7,7 +11,7 @@
        * macros/kde.m4: Define variables for conditional if KDE is
        installed.
        * plugin/klash/klash.cpp: Add code to replace SDL_GetTicks() so we
-       don't have an SDL depenancy still.
+       don't have an SDL dependancy still.
        * server/Makefile.am: Don't have $OPENGL_LIBS in
        libgnashserver_la_LIBADD for now, for some reason it makes the
        executable not ever render an image if installed.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.74 gnash/configure.ac:1.75
--- gnash/configure.ac:1.74     Fri May 12 04:28:11 2006
+++ gnash/configure.ac  Fri May 12 04:51:33 2006
@@ -671,10 +671,12 @@
     fi
     echo "        Cairo libs are: $CAIRO_LIBS"
   else
-    echo "ERROR: No Cairo development package installed!"
+    echo "WARNING: No Cairo development package installed!"
     echo "You need to have the Cairo development package installed"
-    echo "to compile this project or install libcairo-dev "
+    echo "if you have used --enable-render=cairo to configure"
+    echo "To compile this project, install libcairo-dev "
     echo "(using apt-get) or cairo-devel (using yum)."
+    echo "Current Cairo is only being used by developers."
     nogo=true
   fi
 fi
@@ -743,9 +745,10 @@
     echo "        SDL_Mixer flags are: $SDL_MIXER_CFLAGS"
     echo "        SDL_Mixer libs are: $SDL_MIXER_LIBS"
 else
-    echo "ERROR: No SDL_Mixer development package installed!\
+    echo "WARNING: No SDL_Mixer development package installed!\
  You need to have the SDL Mixer development package installed\
- to compile this project with SDL sound support or install\
+ if you wish to have MP3 support for Gnash.\
+ To compile this project with SDL sound support, install\
  libsdl-mixer1.2-dev (using apt-get) or SDL_mixer-devel (using yum)."
 fi