[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in ....
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in .... |
|
Date: |
Thu, 22 Dec 2005 04:56:56 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/22 04:56:56
Modified files:
. : ChangeLog Makefile.am Makefile.in configure
configure.ac
backend : Makefile.in
doc : Makefile.in
doc/C : Makefile.in legal.xml
libbase : Makefile.in
libgeometry : Makefile.in
macros : firefox.m4
plugin : Makefile.in plugin.cpp
plugin/mozilla-sdk: Makefile.in npn_gate.cpp npp_gate.cpp
npplat.h pluginbase.h
server : Makefile.in
utilities : Makefile.in
Log message:
* macros/firefox.m4: Move enable test to here. If firefox-config
doesn't exist, look for mozilla-config. If neither exists, the
plugin won't be built as the mozilla development headers and
libraries aren't installed.
* Makefile.am: DOn't try to build the plugin if the mozilla
development SDK isn't installed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/legal.xml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npn_gate.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npp_gate.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/npplat.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/pluginbase.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.5 gnash/ChangeLog:1.6
--- gnash/ChangeLog:1.5 Wed Dec 21 17:02:59 2005
+++ gnash/ChangeLog Thu Dec 22 04:56:55 2005
@@ -1,5 +1,12 @@
2005-12-21 Rob Savoye <address@hidden>
+ * macros/firefox.m4: Move enable test to here. If firefox-config
+ doesn't exist, look for mozilla-config. If neither exists, the
+ plugin won't be built as the mozilla development headers and
+ libraries aren't installed.
+ * Makefile.am: DOn't try to build the plugin if the mozilla
+ development SDK isn't installed.
+
* config.h.in: Checkin header file produced by autoheader so Gnash
builds on machines without the Autotools installed.
* doc/C/images/car_crash.txt: Add file for alt text so conversion
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.1 gnash/Makefile.am:1.2
--- gnash/Makefile.am:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/Makefile.am Thu Dec 22 04:56:55 2005
@@ -11,7 +11,7 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = dejagnu
-STD_DIRS = libbase libgeometry server backend utilities plugin # testsuite
+STD_DIRS = libbase libgeometry server backend utilities # testsuite
if PLUGIN
SUBDIRS = plugin $(STD_DIRS)
else
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.2 gnash/Makefile.in:1.3
--- gnash/Makefile.in:1.2 Wed Dec 21 02:16:44 2005
+++ gnash/Makefile.in Thu Dec 22 04:56:55 2005
@@ -218,6 +218,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
@@ -231,7 +232,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = dejagnu
-STD_DIRS = libbase libgeometry server backend utilities plugin # testsuite
+STD_DIRS = libbase libgeometry server backend utilities # testsuite
@address@hidden = $(STD_DIRS)
@address@hidden = plugin $(STD_DIRS)
all: config.h
Index: gnash/backend/Makefile.in
diff -u gnash/backend/Makefile.in:1.1 gnash/backend/Makefile.in:1.2
--- gnash/backend/Makefile.in:1.1 Tue Dec 20 21:02:24 2005
+++ gnash/backend/Makefile.in Thu Dec 22 04:56:55 2005
@@ -222,6 +222,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/configure
diff -u gnash/configure:1.2 gnash/configure:1.3
--- gnash/configure:1.2 Wed Dec 21 02:16:44 2005
+++ gnash/configure Thu Dec 22 04:56:55 2005
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE
am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT LIBXML_CFLAGS LIBXML_LIBS DMALLOC_LIB PLUGIN_TRUE
PLUGIN_FALSE HTTP_TRUE HTTP_FALSE docbook_styles FIREFOX_CFLAGS FIREFOX_LIBS
FIREFOX_DEFS FIREFOX_PLUGINS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT
DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE
am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE
am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBPRE LIBEXT CPP X_CFLAGS X_PRE_LIBS
X_LIBS X_EXTRA_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS EGREP SDL_MIXER_CFLAGS
SDL_MIXER_LIBS OPENGL_CFLAGS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE
HAVE_OPENGL_FALSE ZLIB_CFLAGS ZLIB_LIBS JPEG_CFLAGS JPEG_LIBS PNG_CFLAGS
PNG_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77
LIBTOOL PTHREAD_LIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE
am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT LIBXML_CFLAGS LIBXML_LIBS DMALLOC_LIB HTTP_TRUE
HTTP_FALSE docbook_styles mconfig PLUGIN_TRUE PLUGIN_FALSE FIREFOX_CFLAGS
FIREFOX_LIBS FIREFOX_DEFS FIREFOX_PLUGINS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC
EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS
ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBPRE LIBEXT CPP
X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS EGREP
SDL_MIXER_CFLAGS SDL_MIXER_LIBS OPENGL_CFLAGS OPENGL_LIBS GLUT_LIBS GLU_LIBS
HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE ZLIB_CFLAGS ZLIB_LIBS JPEG_CFLAGS JPEG_LIBS
PNG_CFLAGS PNG_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS
ac_ct_F77 LIBTOOL PTHREAD_LIB LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,8 +1036,8 @@
--enable-dmalloc Enable support for DMalloc
--enable-dom Enable support for Dom parser
--enable-xmlreader Enable support for xmlReader parser
- --enable-plugin Enable support for being a plugin
--enable-http Enable support for a web server
+ --enable-plugin Enable support for being a plugin
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-sdltest Do not try to compile and run a test SDL program
@@ -2316,38 +2316,6 @@
if test "${enable_reader+set}" = set; then
enableval="$enable_reader"
case "${enableval}" in
- yes) plugin=yes ;;
- no) plugin=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for
enable-plugin option" >&5
-echo "$as_me: error: bad value ${enableval} for enable-plugin option" >&2;}
- { (exit 1); exit 1; }; } ;;
-esac
-else
- plugin=yes
-fi;
-
-if test x$plugin = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define PLUGIN_SUPPORT
-_ACEOF
-
-fi
-
-
-if test x$plugin = xtrue; then
- PLUGIN_TRUE=
- PLUGIN_FALSE='#'
-else
- PLUGIN_TRUE='#'
- PLUGIN_FALSE=
-fi
-
-
-# Check whether --enable-reader or --disable-reader was given.
-if test "${enable_reader+set}" = set; then
- enableval="$enable_reader"
- case "${enableval}" in
yes) http=yes ;;
no) http=no ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for enable-http
option" >&5
@@ -2408,6 +2376,28 @@
fi
+# Check whether --enable-reader or --disable-reader was given.
+if test "${enable_reader+set}" = set; then
+ enableval="$enable_reader"
+ case "${enableval}" in
+ yes) plugin=yes ;;
+ no) plugin=no ;;
+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for
enable-plugin option" >&5
+echo "$as_me: error: bad value ${enableval} for enable-plugin option" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ plugin=yes
+fi;
+
+if test x$plugin = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PLUGIN_SUPPORT
+_ACEOF
+
+fi
+
# Check whether --with-firefox or --without-firefox was given.
if test "${with_firefox+set}" = set; then
@@ -2449,21 +2439,104 @@
FIREFOX_CFLAGS="-I$prefix/include"
fi
- echo "$as_me:$LINENO: checking for firefox" >&5
-echo $ECHO_N "checking for firefox... $ECHO_C" >&6
no_firefox=""
+ mconfig=""
+
+ # Extract the first word of "firefox-config", so it can be a program name
with args.
+set dummy firefox-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_mconfig+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$mconfig"; then
+ ac_cv_prog_mconfig="$mconfig" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_mconfig="firefox-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
- if test "x$FIREFOX_CFLAGS" = "x" ; then
- FIREFOX_CFLAGS=`firefox-config --cflags`
+fi
+fi
+mconfig=$ac_cv_prog_mconfig
+if test -n "$mconfig"; then
+ echo "$as_me:$LINENO: result: $mconfig" >&5
+echo "${ECHO_T}$mconfig" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+ if test x"$mconfig" = "x" ; then
+ # Extract the first word of "mozilla-config", so it can be a program name
with args.
+set dummy mozilla-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_mconfig+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$mconfig"; then
+ ac_cv_prog_mconfig="$mconfig" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_mconfig="mozilla-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
+
+fi
+fi
+mconfig=$ac_cv_prog_mconfig
+if test -n "$mconfig"; then
+ echo "$as_me:$LINENO: result: $mconfig" >&5
+echo "${ECHO_T}$mconfig" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
- if test "x$FIREFOX_LIBS" = "x" ; then
- FIREFOX_LIBS=`firefox-config --libs`
fi
- if test "x$FIREFOX_LIBS" != "x" ; then
- FIREFOX_DEFS=`firefox-config --defines`
- FIREFOX_PLUGINS=`echo $FIREFOX_LIBS | sed -e 's:-L::'`/plugins
+ if test x"$mconfig" = "x" ; then
+ plugin=""
+ FIREFOX_CFLAGS=""
+ FIREFOX_LIBS=""
+ FIREFOX_DEFS=""
+ FIREFOX_PLUGINS="$HOME/.mozilla/plugins"
+ else
+ echo "$as_me:$LINENO: checking for Firefox/Mozilla SDK" >&5
+echo $ECHO_N "checking for Firefox/Mozilla SDK... $ECHO_C" >&6
+ if test "x$FIREFOX_CFLAGS" = "x" ; then
+ FIREFOX_CFLAGS=`$mconfig --cflags`
+ fi
+
+ if test "x$FIREFOX_LIBS" = "x" ; then
+ FIREFOX_LIBS=`$mconfig --libs`
+ fi
+
+ if test "x$FIREFOX_LIBS" != "x" ; then
+ FIREFOX_DEFS=`$mconfig --defines`
+ FIREFOX_PLUGINS=`echo $FIREFOX_LIBS | sed -e 's:-L::'`/plugins
+ fi
fi
if test "x$FIREFOX_CFLAGS" != "x" -a "x$FIREFOX_LIBS" != "x"; then
@@ -2474,13 +2547,21 @@
#define HAVE_FIREFOX 1
_ACEOF
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
fi
+if test x$plugin = xtrue; then
+ PLUGIN_TRUE=
+ PLUGIN_FALSE='#'
+else
+ PLUGIN_TRUE='#'
+ PLUGIN_FALSE=
+fi
+
+
+
+
@@ -8622,7 +8703,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8625 "configure"' > conftest.$ac_ext
+ echo '#line 8706 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9257,7 +9338,7 @@
# Provide some information about the compiler.
-echo "$as_me:9260:" \
+echo "$as_me:9341:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10291,11 +10372,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10294: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10298: \$? = $ac_status" >&5
+ echo "$as_me:10379: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10524,11 +10605,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10527: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10608: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10531: \$? = $ac_status" >&5
+ echo "$as_me:10612: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10584,11 +10665,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10587: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10591: \$? = $ac_status" >&5
+ echo "$as_me:10672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11918,7 +11999,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 11921 "configure"' > conftest.$ac_ext
+ echo '#line 12002 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12789,7 +12870,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12792 "configure"
+#line 12873 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12887,7 +12968,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12890 "configure"
+#line 12971 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15066,11 +15147,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15073: \$? = $ac_status" >&5
+ echo "$as_me:15154: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15126,11 +15207,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15129: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15210: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15133: \$? = $ac_status" >&5
+ echo "$as_me:15214: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15637,7 +15718,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15640 "configure"' > conftest.$ac_ext
+ echo '#line 15721 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16508,7 +16589,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16511 "configure"
+#line 16592 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16606,7 +16687,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16609 "configure"
+#line 16690 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17433,11 +17514,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17436: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17517: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17440: \$? = $ac_status" >&5
+ echo "$as_me:17521: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17493,11 +17574,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17496: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17500: \$? = $ac_status" >&5
+ echo "$as_me:17581: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18807,7 +18888,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18810 "configure"' > conftest.$ac_ext
+ echo '#line 18891 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19548,11 +19629,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19551: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19632: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19555: \$? = $ac_status" >&5
+ echo "$as_me:19636: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19781,11 +19862,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19784: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19788: \$? = $ac_status" >&5
+ echo "$as_me:19869: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19841,11 +19922,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19844: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19925: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19848: \$? = $ac_status" >&5
+ echo "$as_me:19929: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21175,7 +21256,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 21178 "configure"' > conftest.$ac_ext
+ echo '#line 21259 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22046,7 +22127,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22049 "configure"
+#line 22130 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22144,7 +22225,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22147 "configure"
+#line 22228 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23337,17 +23418,17 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${PLUGIN_TRUE}" && test -z "${PLUGIN_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PLUGIN\" was never defined.
+if test -z "${HTTP_TRUE}" && test -z "${HTTP_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HTTP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PLUGIN\" was never defined.
+echo "$as_me: error: conditional \"HTTP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${HTTP_TRUE}" && test -z "${HTTP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HTTP\" was never defined.
+if test -z "${PLUGIN_TRUE}" && test -z "${PLUGIN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"PLUGIN\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HTTP\" was never defined.
+echo "$as_me: error: conditional \"PLUGIN\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -23960,11 +24041,12 @@
s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
s,@DMALLOC_LIB@,$DMALLOC_LIB,;t t
-s,@PLUGIN_TRUE@,$PLUGIN_TRUE,;t t
-s,@PLUGIN_FALSE@,$PLUGIN_FALSE,;t t
s,@HTTP_TRUE@,$HTTP_TRUE,;t t
s,@HTTP_FALSE@,$HTTP_FALSE,;t t
s,@docbook_styles@,$docbook_styles,;t t
+s,@mconfig@,$mconfig,;t t
+s,@PLUGIN_TRUE@,$PLUGIN_TRUE,;t t
+s,@PLUGIN_FALSE@,$PLUGIN_FALSE,;t t
s,@FIREFOX_CFLAGS@,$FIREFOX_CFLAGS,;t t
s,@FIREFOX_LIBS@,$FIREFOX_LIBS,;t t
s,@FIREFOX_DEFS@,$FIREFOX_DEFS,;t t
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.3 gnash/configure.ac:1.4
--- gnash/configure.ac:1.3 Wed Dec 21 01:19:45 2005
+++ gnash/configure.ac Thu Dec 22 04:56:55 2005
@@ -113,20 +113,6 @@
fi
dnl This enables or disables the support to make Gnash function as a
-dnl Mozilla or Firefox plugin.
-AC_ARG_ENABLE(reader, [ --enable-plugin Enable support for being a
plugin],
-[case "${enableval}" in
- yes) plugin=yes ;;
- no) plugin=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-plugin option]) ;;
-esac], plugin=yes)
-
-if test x$plugin = xyes; then
- AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
-fi
-AM_CONDITIONAL(PLUGIN, test x$plugin = xtrue)
-
-dnl This enables or disables the support to make Gnash function as a
dnl small web server.
AC_ARG_ENABLE(reader, [ --enable-http Enable support for a web server],
[case "${enableval}" in
Index: gnash/doc/C/Makefile.in
diff -u gnash/doc/C/Makefile.in:1.1 gnash/doc/C/Makefile.in:1.2
--- gnash/doc/C/Makefile.in:1.1 Tue Dec 20 20:52:15 2005
+++ gnash/doc/C/Makefile.in Thu Dec 22 04:56:55 2005
@@ -117,8 +117,7 @@
host_triplet = @host@
target_triplet = @target@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/doc/omf.make $(top_srcdir)/doc/xmldocs.make \
- COPYING
+ $(top_srcdir)/doc/omf.make $(top_srcdir)/doc/xmldocs.make
subdir = doc/C
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -262,6 +261,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/doc/C/legal.xml
diff -u gnash/doc/C/legal.xml:1.2 gnash/doc/C/legal.xml:1.3
--- gnash/doc/C/legal.xml:1.2 Wed Dec 21 16:45:09 2005
+++ gnash/doc/C/legal.xml Thu Dec 22 04:56:55 2005
@@ -9,11 +9,4 @@
url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
distributed with this manual.
</para>
- <para>
- Many of the names used by companies to distinguish their products and
- services are claimed as trademarks. Where those names appear in any
- GNOME documentation, and those trademarks are made aware to the members
- of the GNOME Documentation Project, the names have been printed in caps
- or initial caps.
- </para>
</legalnotice>
Index: gnash/doc/Makefile.in
diff -u gnash/doc/Makefile.in:1.1 gnash/doc/Makefile.in:1.2
--- gnash/doc/Makefile.in:1.1 Tue Dec 20 20:52:15 2005
+++ gnash/doc/Makefile.in Thu Dec 22 04:56:55 2005
@@ -207,6 +207,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/libbase/Makefile.in
diff -u gnash/libbase/Makefile.in:1.2 gnash/libbase/Makefile.in:1.3
--- gnash/libbase/Makefile.in:1.2 Wed Dec 21 02:16:44 2005
+++ gnash/libbase/Makefile.in Thu Dec 22 04:56:55 2005
@@ -241,6 +241,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/libgeometry/Makefile.in
diff -u gnash/libgeometry/Makefile.in:1.2 gnash/libgeometry/Makefile.in:1.3
--- gnash/libgeometry/Makefile.in:1.2 Wed Dec 21 02:16:45 2005
+++ gnash/libgeometry/Makefile.in Thu Dec 22 04:56:55 2005
@@ -230,6 +230,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.1 gnash/macros/firefox.m4:1.2
--- gnash/macros/firefox.m4:1.1 Tue Dec 20 21:02:51 2005
+++ gnash/macros/firefox.m4 Thu Dec 22 04:56:56 2005
@@ -21,6 +21,19 @@
[dnl
dnl Get the cflags and libraries
dnl
+dnl This enables or disables the support to make Gnash function as a
+dnl Mozilla or Firefox plugin.
+AC_ARG_ENABLE(reader, [ --enable-plugin Enable support for being a
plugin],
+[case "${enableval}" in
+ yes) plugin=yes ;;
+ no) plugin=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-plugin option]) ;;
+esac], plugin=yes)
+
+if test x$plugin = xyes; then
+ AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
+fi
+
AC_ARG_WITH(firefox,[ --with-firefox=PFX Prefix where firefox is installed
(optional)], firefox_prefix="$withval", firefox_prefix="")
AC_ARG_WITH(firefox-libraries,[ --with-firefox-libraries=DIR Directory
where firefox library is installed (optional)], firefox_libraries="$withval",
firefox_libraries="")
AC_ARG_WITH(firefox-includes,[ --with-firefox-includes=DIR Directory where
firefox header files are installed (optional)], firefox_includes="$withval",
firefox_includes="")
@@ -41,29 +54,44 @@
FIREFOX_CFLAGS="-I$prefix/include"
fi
- AC_MSG_CHECKING(for firefox)
no_firefox=""
+ mconfig=""
- if test "x$FIREFOX_CFLAGS" = "x" ; then
- FIREFOX_CFLAGS=`firefox-config --cflags`
- fi
+ AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
- if test "x$FIREFOX_LIBS" = "x" ; then
- FIREFOX_LIBS=`firefox-config --libs`
+ if test x"$mconfig" = "x" ; then
+ AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
fi
- if test "x$FIREFOX_LIBS" != "x" ; then
- FIREFOX_DEFS=`firefox-config --defines`
- FIREFOX_PLUGINS=`echo $FIREFOX_LIBS | sed -e 's:-L::'`/plugins
+ if test x"$mconfig" = "x" ; then
+ plugin=""
+ FIREFOX_CFLAGS=""
+ FIREFOX_LIBS=""
+ FIREFOX_DEFS=""
+ FIREFOX_PLUGINS="$HOME/.mozilla/plugins"
+ else
+ AC_MSG_CHECKING(for Firefox/Mozilla SDK)
+ if test "x$FIREFOX_CFLAGS" = "x" ; then
+ FIREFOX_CFLAGS=`$mconfig --cflags`
+ fi
+
+ if test "x$FIREFOX_LIBS" = "x" ; then
+ FIREFOX_LIBS=`$mconfig --libs`
+ fi
+
+ if test "x$FIREFOX_LIBS" != "x" ; then
+ FIREFOX_DEFS=`$mconfig --defines`
+ FIREFOX_PLUGINS=`echo $FIREFOX_LIBS | sed -e 's:-L::'`/plugins
+ fi
fi
if test "x$FIREFOX_CFLAGS" != "x" -a "x$FIREFOX_LIBS" != "x"; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support
available])
- else
- AC_MSG_RESULT(no)
fi
+ AM_CONDITIONAL(PLUGIN, test x$plugin = xtrue)
+
AC_SUBST(FIREFOX_CFLAGS)
AC_SUBST(FIREFOX_LIBS)
AC_SUBST(FIREFOX_DEFS)
Index: gnash/plugin/Makefile.in
diff -u gnash/plugin/Makefile.in:1.1 gnash/plugin/Makefile.in:1.2
--- gnash/plugin/Makefile.in:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/Makefile.in Thu Dec 22 04:56:56 2005
@@ -240,6 +240,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/plugin/mozilla-sdk/Makefile.in
diff -u gnash/plugin/mozilla-sdk/Makefile.in:1.2
gnash/plugin/mozilla-sdk/Makefile.in:1.3
--- gnash/plugin/mozilla-sdk/Makefile.in:1.2 Wed Dec 21 02:16:45 2005
+++ gnash/plugin/mozilla-sdk/Makefile.in Thu Dec 22 04:56:56 2005
@@ -233,6 +233,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/plugin/mozilla-sdk/npn_gate.cpp
diff -u gnash/plugin/mozilla-sdk/npn_gate.cpp:1.1
gnash/plugin/mozilla-sdk/npn_gate.cpp:1.2
--- gnash/plugin/mozilla-sdk/npn_gate.cpp:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/npn_gate.cpp Thu Dec 22 04:56:56 2005
@@ -1,40 +1,19 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
////////////////////////////////////////////////////////////
//
@@ -55,20 +34,20 @@
NPError NPN_GetURLNotify(NPP instance, const char *url, const char *target,
void* notifyData)
{
int navMinorVers = NPNFuncs.version & 0xFF;
- NPError rv = NPERR_NO_ERROR;
+ NPError rv = NPERR_NO_ERROR;
- if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
- rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance,
url, target, notifyData);
+ if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
+ rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance, url,
target, notifyData);
else
rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
-
- return rv;
+
+ return rv;
}
NPError NPN_GetURL(NPP instance, const char *url, const char *target)
{
- NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target);
- return rv;
+ NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target);
+ return rv;
}
NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window,
uint32 len, const char* buf, NPBool file, void* notifyData)
Index: gnash/plugin/mozilla-sdk/npp_gate.cpp
diff -u gnash/plugin/mozilla-sdk/npp_gate.cpp:1.1
gnash/plugin/mozilla-sdk/npp_gate.cpp:1.2
--- gnash/plugin/mozilla-sdk/npp_gate.cpp:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/npp_gate.cpp Thu Dec 22 04:56:56 2005
@@ -1,40 +1,19 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
////////////////////////////////////////////////////////////
//
Index: gnash/plugin/mozilla-sdk/npplat.h
diff -u gnash/plugin/mozilla-sdk/npplat.h:1.1
gnash/plugin/mozilla-sdk/npplat.h:1.2
--- gnash/plugin/mozilla-sdk/npplat.h:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/npplat.h Thu Dec 22 04:56:56 2005
@@ -1,39 +1,19 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
#ifndef _NPPLAT_H_
#define _NPPLAT_H_
Index: gnash/plugin/mozilla-sdk/pluginbase.h
diff -u gnash/plugin/mozilla-sdk/pluginbase.h:1.1
gnash/plugin/mozilla-sdk/pluginbase.h:1.2
--- gnash/plugin/mozilla-sdk/pluginbase.h:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/pluginbase.h Thu Dec 22 04:56:56 2005
@@ -1,39 +1,19 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
#ifndef __PLUGININSTANCEBASE_H__
#define __PLUGININSTANCEBASE_H__
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.2 gnash/plugin/plugin.cpp:1.3
--- gnash/plugin/plugin.cpp:1.2 Wed Dec 21 02:16:45 2005
+++ gnash/plugin/plugin.cpp Thu Dec 22 04:56:56 2005
@@ -23,9 +23,6 @@
#include <GL/gl.h> // Header File For The OpenGL32 Library
#include <GL/glu.h> // Header File For The GLu32 Library
-#ifdef USE_GLUT
-#include <GL/glut.h> // Header File For The GLu32 Library
-#endif
#include <unistd.h>
#include <stdio.h>
@@ -38,9 +35,11 @@
// This is our SDL surface
SDL_Surface *surface;
-#define SCREEN_WIDTH 640
-#define SCREEN_HEIGHT 480
-#define SCREEN_BPP 16
+
+const int SCREEN_WIDTH = 640;
+const int SCREEN_HEIGHT = 480;
+const int SCREEN_BPP = 16;
+
int main_loop();
void Quit(int ret);
int initGL(GLvoid);
@@ -73,24 +72,6 @@
GLuint blend; // Turn blending on/off
GLuint filter; // Which Filter To Use
-#ifdef USE_GLUT
-// (nearest/linear/mipmapped)
-// Image type - contains height, width, and data
-struct Image {
- unsigned long sizeX;
- unsigned long sizeY;
- char *data;
-};
-typedef struct Image Image;
-int ImageLoad(char *filename, Image *image);
-GLvoid LoadGLTextures(GLvoid);
-GLvoid InitGL(GLsizei Width, GLsizei Height);
-GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height);
-int drawGLScene(GLvoid);
-void keyPressed(unsigned char key, int x, int y);
-void specialKeyPressed(int key, int x, int y);
-#endif
-
char* NPP_GetMIMEDescription(void)
{
return(MIME_TYPES_DESCRIPTION);
@@ -463,6 +444,7 @@
printf("***********NPP_DestroyStream called %i\n URL: %s\n",
reason, stream->url);
}
+
void
nsPluginInstance::URLNotify(const char *url, NPReason reason,
void *notifyData)
@@ -476,7 +458,8 @@
nsPluginInstance::WriteReady(NPStream * stream)
{
printf("%s(%d): Entering\n", __PRETTY_FUNCTION__, __LINE__);
-
+ printf("Stream for %s is ready\n", stream->url);
+
}
int32
@@ -484,6 +467,8 @@
void *buffer)
{
printf("%s(%d): Entering\n", __PRETTY_FUNCTION__, __LINE__);
+ printf("Reading Stream %s, offset is %d, length = %d \n",
+ stream->url, offset, len);
}
// function to release/destroy our resources and restoring the old desktop
Index: gnash/server/Makefile.in
diff -u gnash/server/Makefile.in:1.2 gnash/server/Makefile.in:1.3
--- gnash/server/Makefile.in:1.2 Wed Dec 21 02:16:45 2005
+++ gnash/server/Makefile.in Thu Dec 22 04:56:56 2005
@@ -232,6 +232,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
Index: gnash/utilities/Makefile.in
diff -u gnash/utilities/Makefile.in:1.1 gnash/utilities/Makefile.in:1.2
--- gnash/utilities/Makefile.in:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/utilities/Makefile.in Thu Dec 22 04:56:56 2005
@@ -224,6 +224,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mconfig = @mconfig@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@