[Gnash-commit] gnash ./ChangeLog macros/cairo.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/10 09:00:48

Modified files:
        .              : ChangeLog 
        macros         : cairo.m4 

Log message:
        * macros/cairo.m4: search cairo dev files even if plugin is disabled

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.294&tr2=1.295&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/cairo.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.294 gnash/ChangeLog:1.295
--- gnash/ChangeLog:1.294       Wed May 10 08:54:48 2006
+++ gnash/ChangeLog     Wed May 10 09:00:48 2006
@@ -1,5 +1,6 @@
 2006-05-10 Sandro Santilli <address@hidden>
 
+       * macros/cairo.m4: search cairo dev files even if plugin is disabled
        * macros/gtk2.m4: fixed handling of --with-gtk2-lib
 
 2006-05-10 Bastiaan Jacques <address@hidden>
Index: gnash/macros/cairo.m4
diff -u gnash/macros/cairo.m4:1.4 gnash/macros/cairo.m4:1.5
--- gnash/macros/cairo.m4:1.4   Mon Apr 24 23:05:55 2006
+++ gnash/macros/cairo.m4       Wed May 10 09:00:48 2006
@@ -49,7 +49,9 @@
     fi
   ])
 
-  if test x"$plugin" = x"yes"; then
+  dnl we can use cairo even if no plugin is enabled
+  dnl if test x"$plugin" = x"yes"; then
+
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_cairo_incl}" = x; then
       AC_CHECK_HEADERS(cairo/cairo.h, [ac_cv_path_cairo_incl=""],[
@@ -119,7 +121,9 @@
         fi
       fi
     fi
-  fi
+
+  dnl we seek cairo even if no plugin is enabled
+  dnl fi
 
   if test x"${ac_cv_path_cairo_incl}" != x ; then
     CAIRO_CFLAGS="-I${ac_cv_path_cairo_incl}"