Index: configure.ac =================================================================== RCS file: /sources/gnash/gnash/configure.ac,v retrieving revision 1.11 diff -u -I'$Id.*$' -p -r1.11 configure.ac --- configure.ac 8 Jan 2006 18:56:27 -0000 1.11 +++ configure.ac 11 Jan 2006 21:33:02 -0000 @@ -157,11 +157,22 @@ AM_PATH_JPEG AM_PATH_PNG AC_PATH_XTRA + +AC_CHECK_HEADER(X11/Xmu/Xmu.h) +LIBS_SAVE="$LIBS" +LIBS="$LIBS $X_LIBS" +AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation, [], + AC_MSG_ERROR([ +Failed to link test code against the Xmu library. Maybe you need to +install the development files for libxmu? +])) +LIBS="$LIBS_SAVE" + AM_PATH_SDL AM_PATH_SDL_MIXER AM_PATH_OPENGL -dnl Define winsock if we're on widows. We could do something complicated, +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 AC_DEFINE(HAVE_WINSOCK,1,[This is defined is we are on Win32]) @@ -262,6 +273,22 @@ else nogo=true fi +if test x"${PNG_LIBS}" != x ; then + echo " PNG flags are: $PNG_CFLAGS" + echo " PNG libs are: $PNG_LIBS" +else + echo " ERROR: No PNG library development package installed!" + nogo=true +fi + +if test x"${JPEG_LIBS}" != x ; then + echo " JPEG flags are: $JPEG_CFLAGS" + echo " JPEG libs are: $JPEG_LIBS" +else + echo " ERROR: No JPEG library development package installed!" + nogo=true +fi + if test x"$opengl" = x"yes"; then if test x"$OPENGL_CFLAGS" != x; then echo " Opengl flags are: $OPENGL_CFLAGS" @@ -296,10 +323,19 @@ if test x"$plugin" = x"yes"; then echo " ERROR: No Firefox or Mozilla development package installed!" nogo=true fi + + if test x"$GLUT_LIBS" != x; then + echo " GLUT flags are: $GLUT_CFLAGS" + echo " GLUT libs are: $GLUT_LIBS" + else + echo " ERROR: No GLUT development package installed." + echo " This is needed for the browser plugin." + nogo=true + fi fi # If anything critical is missing, don't bother to continue if test x"$nogo" = x"true"; then echo "" AC_MSG_ERROR([Please install required packages]) -fi \ No newline at end of file +fi Index: macros/firefox.m4 =================================================================== RCS file: /sources/gnash/gnash/macros/firefox.m4,v retrieving revision 1.4 diff -u -I'$Id.*$' -p -r1.4 firefox.m4 --- macros/firefox.m4 27 Dec 2005 16:19:27 -0000 1.4 +++ macros/firefox.m4 11 Jan 2006 21:33:02 -0000 @@ -86,6 +86,12 @@ AC_ARG_WITH(firefox-includes,[ --with-f AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support available]) fi + dnl Check for GLUT which is needed for the plugin + AC_CHECK_HEADER(glut.h) + AC_CHECK_LIB(glut, glutInit, GLUT_LIBS="-lglut") + AC_SUBST(GLUT_CFLAGS) + AC_SUBST(GLUT_LIBS) + AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes]) AC_SUBST(FIREFOX_CFLAGS) Index: plugin/plugin.cpp =================================================================== RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v retrieving revision 1.6 diff -u -I'$Id.*$' -p -r1.6 plugin.cpp --- plugin/plugin.cpp 7 Jan 2006 18:14:56 -0000 1.6 +++ plugin/plugin.cpp 11 Jan 2006 21:33:02 -0000 @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include