[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/gtk2.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/10 12:21:52

Modified files:
        .              : ChangeLog configure.ac 
        macros         : gtk2.m4 

Log message:
        * configure.ac: don't complain about missing CAIRO when not required
        * macros/gtk2.m4: define HAVE_GTK2 to 1 when needed, not to the empty 
string,
        which is about equivalent to #undef' it

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.297&tr2=1.298&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.297 gnash/ChangeLog:1.298
--- gnash/ChangeLog:1.297       Wed May 10 09:25:28 2006
+++ gnash/ChangeLog     Wed May 10 12:21:52 2006
@@ -1,9 +1,12 @@
 2006-05-10 Sandro Santilli <address@hidden>
 
+       * configure.ac: don't complain about missing CAIRO when not required
        * gui/gtk.cpp: include cairo.h if RENDERER_CAIRO is defined
        * gui/gtksup.h: include cairo.h if RENDERER_CAIRO is defined
        * macros/cairo.m4: search cairo dev files even if plugin is disabled
-       * macros/gtk2.m4: fixed handling of --with-gtk2-lib
+       * macros/gtk2.m4: fixed handling of --with-gtk2-lib, fixed AC_DEFINE
+       call to actually give a value to HAVE_GTK2 define (some code in
+       backend/gnash.cpp would fail otherwise - #ifndef HAVE_GTK2 namely)
 
 2006-05-10 Bastiaan Jacques <address@hidden>
 
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.69 gnash/configure.ac:1.70
--- gnash/configure.ac:1.69     Wed May 10 01:10:06 2006
+++ gnash/configure.ac  Wed May 10 12:21:52 2006
@@ -630,19 +630,21 @@
 dnl    nogo=true
 fi
 
-if test x"$CAIRO_LIBS" != x; then
-  if test x"$CAIRO_CFLAGS" != x; then
-    echo "        Cairo flags are: $CAIRO_CFLAGS"
+if test "$rendered" = "cairo"; then
+  if test x"$CAIRO_LIBS" != x; then
+    if test x"$CAIRO_CFLAGS" != x; then
+      echo "        Cairo flags are: $CAIRO_CFLAGS"
+    else
+      echo "        Cairo flags are: default include path"
+    fi
+    echo "        Cairo libs are: $CAIRO_LIBS"
   else
-    echo "        Cairo flags are: default include path"
+    echo "ERROR: 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 "(using apt-get) or cairo-devel (using yum)."
+    nogo=true
   fi
-    echo "        Cairo libs are: $CAIRO_LIBS"
-else
-  echo "ERROR: No Cairo development package installed!\
- You need to have the Cairo development package installed\
- to compile this project or install libcairo-dev \
- (using apt-get) or cairo-devel (using yum)."
-dnl    nogo=true
 fi
 
 if test x"$ATK_LIBS" != x; then
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.12 gnash/macros/gtk2.m4:1.13
--- gnash/macros/gtk2.m4:1.12   Wed May 10 11:46:33 2006
+++ gnash/macros/gtk2.m4        Wed May 10 12:21:52 2006
@@ -149,7 +149,7 @@
       libincl=`echo ${ac_cv_path_gtk2_incl} | sed -e 's/include/lib/'`
       GTK2_CFLAGS="-I${ac_cv_path_gtk2_incl} -I${libincl}/include"
     fi
-    AC_DEFINE([HAVE_GTK2], [], [Use GTK2 for windowing])
+    AC_DEFINE([HAVE_GTK2], [1], [Use GTK2 for windowing])
   else
     GTK2_CFLAGS=""
   fi