[Gnash] two patches for the plugin

[Steffen Rusitschka]

both let the plugin compile with firefox 1.0.7 on gentoo (x86_64 - should work 
find for 32bit and other distros as well).

don't forget to --enable-plugin on ./configure and add the directory where 
firefox-config is to your path.

currently i get a white box, no matter which .swf i'm trying, but ...
- the plugin gets registered (copy plugin/.libs/* to ~/.mozilla/plugins) which 
you can check via about:plugins in the firefox address bar
- mouse events are shown on the console
- opengl load texture seems to fail:

Loading Shockwave file /tmp/f-81.swf
virtual NPError nsPluginInstance::DestroyStream(NPStream*, NPError) (0): 
file:///home/rusi/newstuff/f-81.swf
int eventThread(void*):
int drawGLScene():
virtual NPError nsPluginInstance::SetWindow(NPWindow*): X origin = 0, Y Origin 
= 0, Width = 1154, Height = 837
int initGL():
int LoadGLTextures()(619): Entering
int LoadGLTextures()(688): Couldn't Loaded texture bitmap
int resizeWindow(int, int)(698): Width = 1154, Height = 837

since i don't wanna reinvent the wheel here, can someone give me the current 
status of the plugin?
and: can someone please remove config.guess, config.sub, and ltmain.sh from 
cvs? this would make diffs much easier ...

cheers,
steffen

          Steffen Rusitschka

   email: address@hidden
homepage: http://rusi.is-a-geek.org




Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.12
diff -u -r1.12 configure.ac
--- configure.ac        12 Jan 2006 09:30:03 -0000      1.12
+++ configure.ac        12 Jan 2006 21:21:19 -0000
@@ -143,8 +143,6 @@
   *)   AC_MSG_ERROR([bad value ${enableval} for enable-mp3 option]) ;;
 esac], mp3=no)
 
-AC_PATH_FIREFOX
-
 AC_PROG_CC
 AC_PROG_CXX
 AC_EXEEXT
@@ -172,6 +170,8 @@
 AM_PATH_SDL_MIXER
 AM_PATH_OPENGL
 
+AC_PATH_FIREFOX
+
 dnl Define winsock if we're on windows. We could do something complicated,
 dnl but since AC_EXEEXT does it for us, we'll do this the easy way.
 if test x"$EXEEXT" == "exe"; then
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.5
diff -u -r1.5 firefox.m4
--- macros/firefox.m4   12 Jan 2006 09:30:04 -0000      1.5
+++ macros/firefox.m4   12 Jan 2006 21:21:27 -0000
@@ -68,11 +76,12 @@
   else
     AC_MSG_CHECKING(for Firefox/Mozilla SDK)
     if test "x$FIREFOX_CFLAGS" = "x" ; then
-      FIREFOX_CFLAGS=`$mconfig --cflags`
+      FIREFOX_CFLAGS=`$mconfig --cflags plugin java`
     fi
 
     if test "x$FIREFOX_LIBS" = "x" ; then
-      FIREFOX_LIBS=`$mconfig --libs`
+      FIREFOX_LIBS=`$mconfig --libs plugin java`
+      AC_MSG_CHECKING(lala $FIREFOX_LIBS)
     fi
 
     if test "x$FIREFOX_LIBS" != "x" ; then
@@ -87,7 +96,7 @@
   fi
 
   dnl Check for GLUT which is needed for the plugin
-  AC_CHECK_HEADER(glut.h)
+  AC_CHECK_HEADER(GL/glut.h)
   AC_CHECK_LIB(glut, glutInit, GLUT_LIBS="-lglut")
   AC_SUBST(GLUT_CFLAGS)
   AC_SUBST(GLUT_LIBS)