[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/fltk.cpp ma...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/05/24 21:35:02

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am fltk.cpp 
        macros         : x11.m4 

Log message:
                * gui/Makefile.am: When building FLTK GUI, also include
                the X11 CFLAGS (when available).
                * gui/fltk.cpp: Only try to do X11 things with FLTK if
                X11 is actually available. Should fix compilation on
                OS X (bug #19618).
                * macros/x11.m4: Don't forget to set the x11 flag 
                variable which is used to check if X11 was found.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3345&r2=1.3346
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3345
retrieving revision 1.3346
diff -u -b -r1.3345 -r1.3346
--- ChangeLog   24 May 2007 20:10:42 -0000      1.3345
+++ ChangeLog   24 May 2007 21:35:01 -0000      1.3346
@@ -1,3 +1,13 @@
+2007-05-24 Bastiaan Jacques <address@hidden>
+
+       * gui/Makefile.am: When building FLTK GUI, also include
+       the X11 CFLAGS (when available).
+       * gui/fltk.cpp: Only try to do X11 things with FLTK if
+       X11 is actually available. Should fix compilation on
+       OS X (bug #19618).
+       * macros/x11.m4: Don't forget to set the x11 flag
+       variable which is used to check if X11 was found.
+
 2007-05-24 Sandro Santilli <address@hidden>
 
        * server/: Makefile.am, impl.cpp, swf/DoActionTag.h,

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- gui/Makefile.am     16 May 2007 15:58:22 -0000      1.74
+++ gui/Makefile.am     24 May 2007 21:35:02 -0000      1.75
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.74 2007/05/16 15:58:22 rsavoye Exp $
+# $Id: Makefile.am,v 1.75 2007/05/24 21:35:02 bjacques Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -184,7 +184,7 @@
 
 if USE_GUI_FLTK
  FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
- AM_CPPFLAGS += $(FLTK2_CFLAGS) 
+ AM_CPPFLAGS += $(FLTK2_CFLAGS) $(X11_CFLAGS)
  AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
 else
  FLTK_SRCS = 

Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gui/fltk.cpp        23 May 2007 13:59:31 -0000      1.12
+++ gui/fltk.cpp        24 May 2007 21:35:02 -0000      1.13
@@ -20,7 +20,11 @@
 
 #include <fltk/Item.h>
 #include <fltk/Window.h>
+
+#ifdef HAVE_X11
 #include <fltk/x11.h>
+#endif
+
 #include <fltk/events.h>
 #include <fltk/run.h>
 #include <fltk/Cursor.h>
@@ -65,6 +69,7 @@
     // so in draw() you can check what exactly you want to redraw. But
     // unfortunately it doesn't seem to remember what bits you turn on. So I'll
     // just do it the old-fashioned way.
+
     static bool firstRun = true;
 
     if (firstRun) {
@@ -213,12 +218,14 @@
 void
 FltkGui::create()
 {
-    // TODO: make the set_xid() call conditional on the availability of X11.
+#ifdef HAVE_X11
     if (_xid) {
+      // Make FLTK render into an X window indicated by the XID.
       CreatedWindow::set_xid(this, _xid);
-    } else {
-      Window::create();
+      return;
     }
+#endif
+    Window::create();
 }
 
 bool

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/x11.m4       18 May 2007 03:52:23 -0000      1.10
+++ macros/x11.m4       24 May 2007 21:35:02 -0000      1.11
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.10 2007/05/18 03:52:23 martinwguy Exp $
+dnl $Id: x11.m4,v 1.11 2007/05/24 21:35:02 bjacques Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
@@ -117,8 +117,16 @@
     AC_MSG_RESULT(none)
   fi
 
+  if test -n "$X11_LIBS" -a -n "$X11_CFLAGS"; then
+    x11=yes
+  fi
+
   AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
 
+  if test "x$x11" = xyes; then
+    AC_DEFINE(HAVE_X11, [1], [X11 headers and libraries])
+  fi
+
   AC_SUBST(X11_CFLAGS)
   AC_SUBST(X11_LIBS)
 ])