[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./configure.ac macros/firefox.m4 plugin/p...
From: |
strk |
Subject: |
[Gnash-commit] gnash ./configure.ac macros/firefox.m4 plugin/p... |
Date: |
Thu, 12 Jan 2006 09:30:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: strk <address@hidden> 06/01/12 09:30:05
Modified files:
. : configure.ac
macros : firefox.m4
plugin : plugin.cpp
Log message:
Check for libXmu and GLUT, report JPEG, PNG and GLUT detected flags, add
missing include of Xm.h in plugin.cpp - by J.H.M. Dassen (Ray)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.11 gnash/configure.ac:1.12
--- gnash/configure.ac:1.11 Sun Jan 8 18:56:27 2006
+++ gnash/configure.ac Thu Jan 12 09:30:03 2006
@@ -157,11 +157,22 @@
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 @@
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 @@
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: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.4 gnash/macros/firefox.m4:1.5
--- gnash/macros/firefox.m4:1.4 Tue Dec 27 16:19:27 2005
+++ gnash/macros/firefox.m4 Thu Jan 12 09:30:04 2006
@@ -86,6 +86,12 @@
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: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.6 gnash/plugin/plugin.cpp:1.7
--- gnash/plugin/plugin.cpp:1.6 Sat Jan 7 18:14:56 2006
+++ gnash/plugin/plugin.cpp Thu Jan 12 09:30:05 2006
@@ -29,7 +29,6 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
-#include <Xm/XmAll.h>
#include <X11/XKBlib.h>
#include <X11/keysym.h>
#include <X11/Sunkeysym.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./configure.ac macros/firefox.m4 plugin/p...,
strk <=