[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac plugin/Makefil...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac plugin/Makefil... |
Date: |
Sat, 04 Mar 2006 04:52:24 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/03/04 04:52:24
Modified files:
. : ChangeLog configure.ac
plugin : Makefile.am
Added files:
macros : kde.m4
plugin/mozplugger: README mozpluggerrc.patch
plugin/klash : Makefile.am README klash.desktop klash_part.cpp
klash_part.desktop klash_part.h klashpartui.rc
klashplayer.lsm klashrc pluginsinfo
Log message:
* plugin/klash: Build klash, a Gnash customized Konquerer plugin
that works similar to MozPlugger contributed by Koos Vriezen
<address@hidden>.
* configure.ac: Add Klash support, which optionally invokes a
bunch of KDE tests. Add --enable-klash to build Konquerer plugin.
* macros/kde.m4: KDE config macros that seem to be a default
collection. These have been tweaked so the errors if QT or KDE
isn't found are removed. This is done later in configure.in, and
we want to build all the other code on systems without KDE.
* plugin/mozplugger: Add patch to add Gnash support to
MozPlugger.
* plugin/klash/README, klash.desktop, klash_part.cpp,
klash_part.desktop, klash_part.h, klashpartui.rc,
klashplayer.lsm, klashrc, pluginsinfo: New files from contributed
Konquer plugin (works similar to MozPlugger)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.169&tr2=1.170&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozplugger/README?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozplugger/mozpluggerrc.patch?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/Makefile.am?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/README?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash.desktop?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.desktop?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klashpartui.rc?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klashplayer.lsm?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klashrc?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/pluginsinfo?rev=1.1
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.169 gnash/ChangeLog:1.170
--- gnash/ChangeLog:1.169 Thu Mar 2 21:21:55 2006
+++ gnash/ChangeLog Sat Mar 4 04:52:24 2006
@@ -1,3 +1,21 @@
+2006-03-03 Rob Savoye <address@hidden>
+
+ * plugin/klash: Build klash, a Gnash customized Konquerer plugin
+ that works similar to MozPlugger contributed by Koos Vriezen
+ <address@hidden>.
+ * configure.ac: Add Klash support, which optionally invokes a
+ bunch of KDE tests. Add --enable-klash to build Konquerer plugin.
+ * macros/kde.m4: KDE config macros that seem to be a default
+ collection. These have been tweaked so the errors if QT or KDE
+ isn't found are removed. This is done later in configure.in, and
+ we want to build all the other code on systems without KDE.
+ * plugin/mozplugger: Add patch to add Gnash support to
+ MozPlugger.
+ * plugin/klash/README, klash.desktop, klash_part.cpp,
+ klash_part.desktop, klash_part.h, klashpartui.rc,
+ klashplayer.lsm, klashrc, pluginsinfo: New files from contributed
+ Konquer plugin (works similar to MozPlugger)
+
2006-03-02 Rob Savoye <address@hidden>
* plugin/plugin.cpp: Always lock the display before locking X. Add
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.43 gnash/configure.ac:1.44
--- gnash/configure.ac:1.43 Thu Mar 2 17:34:36 2006
+++ gnash/configure.ac Sat Mar 4 04:52:24 2006
@@ -15,7 +15,6 @@
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(server/gnash.h)
@@ -28,18 +27,34 @@
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
+dnl Add KFLASH support, if specified.
+AC_ARG_ENABLE(klash, [ --enable-klash Enable support for Konquerer
plugin],
+[case "${enableval}" in
+ yes) klash=yes ;;
+ no) klash=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-klash option]) ;;
+esac],klash=no)
+
+AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
+AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
+KDE_SET_PREFIX
+AM_KDE_WITH_NLS
+AC_PATH_KDE
+KDE_USE_QT(3)
+AM_CONDITIONAL(KLASH, test x$klash = xyes)
+
dnl Add XML support, if specified.
AC_ARG_ENABLE(libxml, [ --disable-xml Disable support for xml and
xmlsocket],
[case "${enableval}" in
- yes) disablexml=yes ;;
- no) disablexml=no ;;
+ yes) xml=yes ;;
+ no) xml=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
-esac],disablexml=no)
+esac],xml=no)
-if test x$enable_xml != xno; then
+if test x$xml != xno; then
AM_PATH_LIBXML2
fi
-AM_CONDITIONAL(XML, test x$enable_xml = xyes)
+AM_CONDITIONAL(XML, test x$xml = xyes)
dnl Fix the Intel 810 LOD bias problem
AC_ARG_ENABLE(i810-lod-bias, [ --enable-i810-lod-bias Enable fix for Intel
810 LOD bias problem],
@@ -206,7 +221,9 @@
doc/Doxyfile
testsuite/Makefile
testsuite/actionscript.all/Makefile
-plugin/Makefile plugin/mozilla-sdk/Makefile
+plugin/Makefile
+plugin/mozilla-sdk/Makefile
+plugin/klash/Makefile
)
dnl config.mk
dnl plugin/test/Makefile
@@ -248,7 +265,7 @@
echo " DMalloc support disabled (default)"
fi
-if test x$enable_xml = xno; then
+if test x$xml = xno; then
echo " XML and XMLSocket disabled"
else
echo " XML and XMLSocket enabled (default)"
@@ -260,6 +277,12 @@
echo " Firefox plugin disabled"
fi
+if test x"$klash" = x"yes"; then
+ echo " Konquerer plugin enabled"
+else
+ echo " Konquerer plugin disabled (default)"
+fi
+
if test x"$ghelp" = x"yes"; then
echo " GNOME help enabled"
else
@@ -290,7 +313,7 @@
# easy for new developers to get everything they need installed.
nogo=false
-if test x$enable_xml != xno; then
+if test x$xml != xno; then
if test x"$LIBXML_CFLAGS" != x; then
echo " XML flags are: $LIBXML_CFLAGS"
echo " XML libs are: $LIBXML_LIBS"
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.12 gnash/plugin/Makefile.am:1.13
--- gnash/plugin/Makefile.am:1.12 Sat Feb 25 05:19:15 2006
+++ gnash/plugin/Makefile.am Sat Mar 4 04:52:24 2006
@@ -19,7 +19,10 @@
AUTOMAKE_OPTIONS = dejagnu
-SUBDIRS = mozilla-sdk # test
+if KLASH
+KLASH = klash
+endif
+SUBDIRS = mozilla-sdk $(KLASH) # test
if MP3
MP3_CFLAGS = $(MAD_CFLAGS)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure.ac plugin/Makefil...,
Rob Savoye <=