CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/08/03 03:01:16
Modified files:
plugin : Makefile.am
. : Makefile.am configure.ac ChangeLog
gui : Makefile.am
macros : firefox.m4 kde.m4
plugin/klash : Makefile.am
Log message:
* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
NSAPI instead of PLUGIN, KPARTS instead of KLASH.
* Makefile.am: Change from PLUGIN to NSAPI and KPARTS for
conditionals.
* configure.ac: Change --disable-klash to --disable-kparts, add
--disable-nsapi to replace the older --disable-plugin
setting. Make building the plugins conditional on the gui being
selected and if the development libraries exist.
* gui/Makefile.am: Comment out the dyna,ic vs static support,
it's
uneeded for now.
* macros/firefox.m4: Use nsapi instead of plugin as the
conditional.
* macros/kde.m4: set has_kde to yes by default. It can get
disabled later.
* plugin/klash/Makefile.am: Use KPARTS instead of KLASH.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.388&r2=1.389
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3926&r2=1.3927
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- plugin/Makefile.am 1 Jul 2007 10:54:14 -0000 1.60
+++ plugin/Makefile.am 3 Aug 2007 03:01:15 -0000 1.61
@@ -15,14 +15,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.60 2007/07/01 10:54:14 bjacques Exp $
+# $Id: Makefile.am,v 1.61 2007/08/03 03:01:15 rsavoye Exp $
AUTOMAKE_OPTIONS =
-if KLASH
+if BUILD_KDE_GUI
KLASH = klash
endif
-SUBDIRS = $(KLASH) # test mozilla-sdk
+SUBDIRS = $(KLASH)
# if DMALLOC
# MALL_CFLAGS = $(DMALLOC_CFLAGS)
@@ -79,6 +79,7 @@
mozilla-sdk/include/prwin16.h \
mozilla-sdk/include/obsolete/protypes.h
+if NSAPI
libgnashplugin_la_SOURCES = plugin.cpp \
mozilla-sdk/npn_gate.cpp \
mozilla-sdk/npp_gate.cpp \
@@ -114,3 +115,5 @@
uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
$(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so
+
+endif
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Makefile.am 26 Jul 2007 15:40:35 -0000 1.82
+++ Makefile.am 3 Aug 2007 03:01:15 -0000 1.83
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.82 2007/07/26 15:40:35 strk Exp $
+# $Id: Makefile.am,v 1.83 2007/08/03 03:01:15 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -34,14 +34,12 @@
po \
$(NULL)
-if PLUGIN
-if HAVE_GTK2
+if NSAPI
PLUGIN_DIRS = plugin
-else
-if KLASH
-PLUGIN_DIRS = plugin
-endif
endif
+
+if KPARTS
+PLUGIN_DIRS = plugin
endif
if DOCBOOK
@@ -219,8 +217,25 @@
@echo "Configurable options are:"
@echo "Media handler: $(MEDIA_CONFIG)"
@echo "Renderer engine: $(RENDERER_CONFIG)"
- @echo "Supported GUI: $(GUI_CONFIG) ( default $(DEFAULT_GUI) )"
-# @echo "Extensions: "
+
+if BUILD_GTK_GUI
+ @echo "Supported GUI: GTK"
+endif
+if BUILD_KDE_GUI
+ @echo "Supported GUI: KDE"
+endif
+if BUILD_SDL_GUI
+ @echo "Supported GUI: SDL"
+endif
+if BUILD_FLTK_GUI
+ @echo "Supported GUI: FLTK"
+endif
+if BUILD_AQUA_GUI
+ @echo "Supported GUI: AQUA"
+endif
+if BUILD_FB_GUI
+ @echo "Supported GUI: FB"
+endif
check: check-recursive anal
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -b -r1.388 -r1.389
--- configure.ac 31 Jul 2007 21:59:49 -0000 1.388
+++ configure.ac 3 Aug 2007 03:01:15 -0000 1.389
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.388 2007/07/31 21:59:49 strk Exp $
+dnl $Id: configure.ac,v 1.389 2007/08/03 03:01:15 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -220,15 +220,8 @@
AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
-dnl Add KFLASH support, if specified.
-AC_ARG_ENABLE(klash,
- AC_HELP_STRING([--disable-klash], [Disable support for Konqueror plugin]),
-[case "${enableval}" in
- yes) klash=yes ;;
- no) klash=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
-esac],klash=yes)
-
+has_kde=no
+has_gtk2=no
build_fb=no
build_fltk=no
build_kde=no
@@ -609,7 +602,7 @@
export incllist="`eval echo ${with_top_level}/include
${pkgroot}/${host_alias}/include ${pkgroot}/include`"
export libslist="`eval echo ${with_top_level}/lib
${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib`"
export pathlist="`eval echo ${pkgroot}/${host_alias}/bin:${pkgroot}/bin`"
- plugin=no
+ nsapi=no
else
AC_MSG_NOTICE([Configuring Gnash for native compilation])
export incllist="`eval cat ${srcdir}/macros/incllist`"
@@ -638,21 +631,57 @@
AC_PATH_TOOL([AUTOTRACE], [autotrace])
AC_HEADER_DIRENT
+dnl Add KFLASH support, if specified.
+
+AC_ARG_ENABLE(kparts,
+ AC_HELP_STRING([--disable-kparts], [Disble support for Konqueror plugin
(default=no)]),
+[case "${enableval}" in
+ yes) kparts=yes ;;
+ no) kparts=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --disable-kpart option]) ;;
+esac],kparts=yes)
+
dnl
-dnl !! This has been moved here to make --enable-plugin work
+dnl !! This has been moved here to make --enable-nsapi work
dnl !! All of plugin-related macro calls could be moved into
dnl !! a specialized macros/plugin.m4
dnl
-AC_ARG_ENABLE(plugin,
- AC_HELP_STRING([--disable-plugin], [Disable plugins build]),
+AC_ARG_ENABLE(nsapi,
+ AC_HELP_STRING([--disable-nsapi], [Disable NSAPI plugin build (default=no)]),
[case "${enableval}" in
- yes) plugin=yes ;;
- no) plugin=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
+ yes) nsapi=yes ;;
+ no) nsapi=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for disable-nsapi option]) ;;
esac],
- plugin=yes
+ nsapi=yes
)
+dnl dnl Enable us to disable building all browser plugins in one command.
+dnl AC_ARG_ENABLE(plugins,
+dnl AC_HELP_STRING([--disable-plugins], [Disable all browser plugins from
building (default=no)]),
+dnl [case "${enableval}" in
+dnl yes) plugins=yes ;;
+dnl no) plugins=no ;;
+dnl *) AC_MSG_ERROR([bad value ${enableval} for disable-plugins option])
;;
+dnl esac],
+dnl plugins=yes
+dnl )
+dnl if test x$plugins = xno; then
+dnl nsapi=no
+dnl kparts=no
+dnl fi
+
+dnl if test x$build_gtk = xyes; then
+dnl if test x$plugins = xyes; then
+dnl nsapi=yes
+dnl fi
+dnl fi
+dnl if test x$build_kde = xyes; then
+dnl if test x$plugins = xyes; then
+dnl kparts=yes
+dnl fi
+dnl fi
+
GNASH_PATH_FIREFOX
dnl IRIX-hack.
@@ -900,35 +929,48 @@
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(short)
-dnl # NO plugin ? NO klash !
-if test x"$plugin" = xno; then
- echo "WARNING: plugin disabled, klash disabled accordingly"
- klash=no
-fi
-
-dnl # Check KDE if kde gui or klash were requested
-if test x$build_kde = xyes -o x"$klash" = xyes; then
+dnl # Check KDE if kde gui or kparts were requested
+if test x$build_kde = xyes -o x"$kparts" = xyes; then
kde=yes
qt=yes
- build_kde=yes
GNASH_PATH_KDE
GNASH_PATH_QT
fi
AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
-dnl # NO kde ? NO klash !
-if test x$has_kde != xyes; then
- if test x$klash = xyes; then
- echo "WARNING: No KDE development package installed, disabling klash"
- klash=no
- fi
+dnl Need GLIB for both GTK and GST
+if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
+ GNASH_PATH_GLIB
fi
-if test x$has_qt != xyes; then
- if test x$klash = xyes; then
- echo "WARNING: No QT development package installed, disabling klash"
- klash=no
- fi
+
+AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
+
+if test x$build_ogl = xyes -a x$build_gtk = xyes; then
+ GNASH_PATH_GLEXT
+fi
+if test x$build_gtk = xyes; then
+ GNASH_PATH_GTK2
+ GNASH_PATH_PANGO
+ GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
+fi
+
+if test x$has_gtk2 = xyes; then
+ nsapi=yes
+fi
+
+dnl if gtk isn't installed, even if it's specified, don't try to build
+dnl the NSAPI plugin, which is GTK based.
+if test x$has_gtk2 = xno; then
+ nsapi=no
+ AC_MSG_WARN(["No GTK development package installed, disabling NSAPI plugin"])
+fi
+
+dnl if kde isn't installed, even if it's specified, don't try to build
+dnl the KPARTS plugin, which is KDE based.
+if test x$has_kde = xno; then
+ kparts=no
+ AC_MSG_WARN(["No KDE development package installed, disabling KPARTS
plugin"])
fi
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
@@ -940,7 +982,9 @@
AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
-AM_CONDITIONAL(KLASH, [test x$klash = xyes])
+# plugin building flags
+AM_CONDITIONAL(NSAPI, [test x$nsapi = xyes])
+AM_CONDITIONAL(KPARTS, [test x$kparts = xyes])
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
@@ -948,22 +992,6 @@
GNASH_PATH_OPENGL
fi
-dnl Need GLIB for both GTK and GST
-if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
- GNASH_PATH_GLIB
-fi
-
-AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
-
-if test x$build_ogl = xyes -a x$build_gtk = xyes; then
- GNASH_PATH_GLEXT
-fi
-if test x$build_gtk = xyes; then
- GNASH_PATH_GTK2
- GNASH_PATH_PANGO
- GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
-fi
-
if test x$build_gtk = xyes; then
AC_ARG_ENABLE(ghelp,
AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help
system]),
@@ -997,7 +1025,7 @@
GNASH_PKG_FIND(expat, [expat.h], [Expat library], XML_ErrorString)
dnl these conditionals were moved out of kde.m4
-AM_CONDITIONAL(HAS_KDE, [test x$kde = xyes])
+AM_CONDITIONAL(HAS_KDE, [test x$has_kde = xyes])
# used to disable x11-specific stuff on special platforms
AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test
"$kde_use_qt_mac" = "no")
AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
@@ -1012,10 +1040,9 @@
AC_ERROR([You have GTK installed, but not GtkGLExt. You need GtkGLExt to
use the OpenGL renderer. Attempting to build SDL version])
fi
gui=sdl
- plugin=no
+ nsapi=no
AC_MSG_WARN([GTK2 specified for the GUI, but GtkGlExt is not present. Trying
SDL instead.])
fi
-AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
if test x"$media_handler" = x"ffmpeg"; then
GNASH_PATH_FFMPEG
@@ -1357,14 +1384,14 @@
echo " DMalloc support disabled (default). Use --enable-dmalloc to
enable."
fi
-if test x"$plugin" = x"yes"; then
- echo " Firefox plugin enabled (default). Use --disable-plugin to
disable."
+if test x"$nsapi" = x"yes"; then
+ echo " Firefox plugin enabled (default). Use --disable-nsapi to
disable."
else
echo " Firefox plugin disabled."
fi
-if test x"$klash" = x"yes"; then
- echo " Konqueror plugin enabled (default). Use --disable-klash to
disable"
+if test x"$kparts" = x"yes"; then
+ echo " Konqueror plugin enabled (default). Use --disble-kparts to
disable"
else
echo " Konqueror plugin disabled."
fi
@@ -1448,14 +1475,14 @@
fi
fi
-if test x$kde = xyes -o x$klash = xyes; then
+if test x$kde = xyes -o x$kparts = xyes; then
if test x"$has_kde" = xyes; then
echo " KDE flags are: $KDE_CFLAGS"
echo " KDE libs are: $KDE_LIBS"
else
- if test x$build_kde = xyes -o x$klash = xyes ; then
+ if test x$build_kde = xyes -o x$parts = xyes ; then
echo " ERROR: No KDE development package installed!"
- echo " Reconfigure with --disable-klash and/or"
+ echo " Reconfigure with --disable-kparts and/or"
echo " change to a different gui with --enable-gui=..."
echo " or install the KDE development environment from
http://kde.org";
echo " or .deb users: apt-get install kdelibs-dev"
@@ -1467,7 +1494,7 @@
echo " QT flags are: $QT_CFLAGS"
echo " QT libs are: $QT_LIBS"
else
- if test x$build_kde = xyes -o x$klash = xyes ; then
+ if test x$build_kde = xyes -o x$kparts = xyes ; then
if test x"$has_kde" != xyes; then
# We have already moaned about KDE absence, so presumably they'll get
# QT-dev when they install KDE-dev
@@ -1477,8 +1504,8 @@
echo " ERROR: No QT development package installed!"
echo " Install a QT development environment from
http://trolltech.com";
echo " or .deb users: apt-get install libqt3-mt-dev"
- if test x$klash = xyes; then
- echo " or reconfigure with --disable-klash"
+ if test x$kparts = xyes; then
+ echo " or reconfigure with --disable-kparts"
fi
if test x$build_kde = xyes; then
echo " or change to a different gui with
--enable-gui=..."
@@ -1784,7 +1811,7 @@
fi
unset need_sdl
-if test x"$plugin" = x"yes"; then
+if test x"$nsapi" = x"yes"; then
dnl if test x"$FIREFOX_CFLAGS" != x; then
dnl echo " Firefox flags are: $FIREFOX_CFLAGS"
dnl echo " Firefox libs are: $FIREFOX_LIBS"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3926
retrieving revision 1.3927
diff -u -b -r1.3926 -r1.3927
--- ChangeLog 2 Aug 2007 23:08:08 -0000 1.3926
+++ ChangeLog 3 Aug 2007 03:01:16 -0000 1.3927
@@ -1,3 +1,20 @@
+2007-08-02 Rob Savoye <[EMAIL PROTECTED]>
+
+ * plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
+ NSAPI instead of PLUGIN, KPARTS instead of KLASH.
+ * Makefile.am: Change from PLUGIN to NSAPI and KPARTS for conditionals.
+ * configure.ac: Change --disable-klash to --disable-kparts, add
+ --disable-nsapi to replace the older --disable-plugin
+ setting. Make building the plugins conditional on the gui being
+ selected and if the development libraries exist.
+ * gui/Makefile.am: Comment out the dyna,ic vs static support, it's
+ uneeded for now.
+ * macros/firefox.m4: Use nsapi instead of plugin as the
+ conditional.
+ * macros/kde.m4: set has_kde to yes by default. It can get
+ disabled later.
+ * plugin/klash/Makefile.am: Use KPARTS instead of KLASH.
+
2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
* server/asobj/gen-asclass.sh: add the addStatic call to statics.
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- gui/Makefile.am 2 Aug 2007 05:30:13 -0000 1.100
+++ gui/Makefile.am 3 Aug 2007 03:01:16 -0000 1.101
@@ -98,7 +98,7 @@
# LIB_FLAGS = -release $(VERSION)
# endif # ENABLE_SHARED
# else # make shared libraries suitable for linking.
-# LIB_FLAGS = -release $(VERSION)
+ LIB_FLAGS = -release $(VERSION)
# endif # DYNAMIC_GUI
# AQUA Toolkit
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/firefox.m4 29 Jul 2007 19:22:06 -0000 1.24
+++ macros/firefox.m4 3 Aug 2007 03:01:16 -0000 1.25
@@ -35,7 +35,7 @@
FIREFOX_PLUGINS=""
GNASHEXE=""
- if test x"${plugin}" = x"yes"; then
+ if test x"${nsapi}" = x"yes"; then
AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory
to install Firefox plugin in]),
[FIREFOX_PLUGINS=$withval]
@@ -66,106 +66,6 @@
AC_SUBST(FIREFOX_PLUGINS)
])dnl end of GNASH_PATH_FIREFOX
-
-dnl This is the old version which we're keeping around for now. It
-dnl would be very useful if the plugin does develop more of a
-dnl dependancy on the mozilla development package.
-AC_DEFUN([GNASH_PATH_FIREFOX_FULL],
-[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(plugin, AC_HELP_STRING([--enable-plugin-full], [Enable
-support for being a plugin using Firefox development packages]),
- [case "${enableval}" in
- yes) plugin=yes ;;
- no) plugin=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
- esac], plugin=yes)
-
- if test x"$plugin" = x"yes"; then
- AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
-
- AC_ARG_WITH(firefox, AC_HELP_STRING([--with-firefox=PFX], [Prefix where
firefox is installed (optional)]),
- [firefox_prefix=$withval], [firefox_prefix=""]
- )
- AC_ARG_WITH(firefox-libraries,
AC_HELP_STRING([--with-firefox-libraries=DIR], [Directory where firefox library
is installed (optional)]),
- [firefox_libraries=$withval], [firefox_libraries=""]
- )
- AC_ARG_WITH(firefox-includes,AC_HELP_STRING([--with-firefox-includes=DIR],
[Directory where firefox header files are installed (optional)]),
- [firefox_includes=$withval], [firefox_includes=""]
- )
- AC_ARG_WITH(plugin-dir, AC_HELP_STRING([--with-plugin-dir=DIR], [Mozilla
plugin dir]),
- [FIREFOX_PLUGINS=$withval]
- )
-
- if test "x${firefox_libraries}" != "x" ; then
- FIREFOX_LIBS="-L$firefox_libraries"
- elif test "x${firefox_prefix}" != "x" ; then
- FIREFOX_LIBS="-L${firefox_prefix}/lib"
- fi
-
- if test "x$firefox_includes" != "x" ; then
- FIREFOX_CFLAGS="-I$firefox_includes"
- elif test "x$firefox_prefix" != "x" ; then
- FIREFOX_CFLAGS="-I$firefox_prefix/include"
- fi
-
- no_firefox=""
- mconfig=""
-
- AC_CHECK_PROG(mconfig, firefox-config, firefox-config)
-
- if test x"${mconfig}" = "x" ; then
- AC_CHECK_PROG(mconfig, mozilla-config, mozilla-config)
- fi
-
- if test x"${mconfig}" = "x" ; then
- plugin="no"
- FIREFOX_CFLAGS=""
- FIREFOX_LIBS=""
- FIREFOX_DEFS=""
- else
- AC_MSG_CHECKING([for Firefox/Mozilla SDK])
- if test "x${FIREFOX_CFLAGS}" = "x" ; then
-dnl -I/usr/include/mozilla/java
-dnl -I/usr/include/mozilla/plugin
-dnl -I/usr/include/mozilla/nspr
-dnl -I/usr/include/mozilla
- FIREFOX_CFLAGS=`${mconfig} --cflags java plugin`
- fi
-
- if test "x${FIREFOX_LIBS}" = "x" ; then
-dnl -L/usr/lib/mozilla
- FIREFOX_LIBS=`${mconfig} --libs java plugin`
- fi
-
- if test "x${FIREFOX_LIBS}" != "x" ; then
-dnl -DMOZ_X11=1 is all that's really needed
- FIREFOX_DEFS=`${mconfig} --defines java plugin`
-dnl if we don't have a path for the plugin by now, pick a default one
- if test x"${FIREFOX_PLUGINS}" = "x" ; then
- FIREFOX_PLUGINS=`echo ${FIREFOX_LIBS} | sed -e 's:-L\(@<:@^
@:>@*\) .*$:\1:' -e 's:^-L::'`/plugins
- fi
- 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])
- fi
- fi
-
- AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
-
- AC_SUBST(FIREFOX_CFLAGS)
- AC_SUBST(FIREFOX_LIBS)
- AC_SUBST(FIREFOX_DEFS)
- AC_SUBST(FIREFOX_PLUGINS)
-])
-dnl end of GNASH_PATH_FIREFO
-
# Local Variables:
# c-basic-offset: 2
# tab-width: 2
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/kde.m4 1 Jul 2007 10:54:12 -0000 1.34
+++ macros/kde.m4 3 Aug 2007 03:01:16 -0000 1.35
@@ -14,7 +14,7 @@
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 $Id: kde.m4,v 1.34 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: kde.m4,v 1.35 2007/08/03 03:01:16 rsavoye Exp $
AC_DEFUN([GNASH_PATH_KDE],
[
@@ -31,7 +31,7 @@
])
kde_prefix="/usr"
- has_kde=yes
+ has_kde=no
if test x"${ac_cv_path_kde_incl}" = x; then
AC_PATH_PROG(KDE_CONFIG, kde-config, ,[${pathlist}])
if test "x$KDE_CONFIG" != "x" ; then
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- plugin/klash/Makefile.am 23 Jul 2007 22:20:48 -0000 1.32
+++ plugin/klash/Makefile.am 3 Aug 2007 03:01:16 -0000 1.33
@@ -15,11 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.32 2007/07/23 22:20:48 strk Exp $
+# $Id: Makefile.am,v 1.33 2007/08/03 03:01:16 rsavoye Exp $
AUTOMAKE_OPTIONS =
-if KLASH
+if KPARTS
AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
plugindir = $(libdir)/kde3
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
