[Gnash-commit] gnash ChangeLog Makefile.am configure.ac doc/C/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/30 10:44:45

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        doc/C/usermanual/installation: custompath_configuration.xml 
                                       feature_configuration.xml 
        macros         : firefox.m4 
        plugin/klash   : Makefile.am 

Log message:
        Provide --with-kde-plugindir and --with-kde-servicesdir to change 
installation
        paths of the kparts plugin. Fixes bug #21907.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5273&r2=1.5274
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.464&r2=1.465
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5273
retrieving revision 1.5274
diff -u -b -r1.5273 -r1.5274
--- ChangeLog   29 Dec 2007 22:16:22 -0000      1.5273
+++ ChangeLog   30 Dec 2007 10:44:43 -0000      1.5274
@@ -1,3 +1,15 @@
+2007-12-30 Sandro Santilli <address@hidden>
+
+       * Makefile.am, configure.ac: add --with-kde-plugindir
+         and --with-kde-servicesdir options.
+       * doc/C/usermanual/installation/: custompath_configuration.xml,
+         feature_configuration.xml: document new kparts options and cleanup
+         info about the npapi plugin a bit.
+       * macros/firefox.m4: use the NPAPI acronym when referring to the
+         formerly known as "Firefox" plugin.
+       * plugin/klash/Makefile.am: use kparts installation patsh as detected
+         or specified by user at configure time.
+
 2007-12-29  Rob Savoye  <address@hidden>
 
        * testsuite/misc-swfc.all/Makefile.am: Add TEST_CASES to

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- Makefile.am 3 Dec 2007 00:22:04 -0000       1.95
+++ Makefile.am 30 Dec 2007 10:44:44 -0000      1.96
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.95 2007/12/03 00:22:04 rsavoye Exp $
+# $Id: Makefile.am,v 1.96 2007/12/30 10:44:44 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -326,15 +326,18 @@
 endif
 
 if KPARTS
-       @echo " Konqueror (KPARTS) plugin enabled"
+       @echo " KPARTS (KDE) plugin enabled"
+       @echo "   KPARTS plugin install dir: $(KDE_PLUGINDIR)"
+       @echo "   KPARTS service install dir: $(KDE_SERVICESDIR)"
 else
-       @echo " Konqueror (KPARTS) plugin disabled"
+       @echo " KPARTS (KDE) plugin disabled"
 endif
 
 if NSAPI
-       @echo " Firefox (NSAPI) plugin enabled"
+       @echo " NPAPI (Mozilla) plugin enabled"
+       @echo "   NPAPI plugin install dir: $(FIREFOX_PLUGINS)"
 else
-       @echo " Firefox (NSAPI) plugin disabled"
+       @echo " NPAPI (Mozilla) plugin disabled"
 endif
        @if test -n "$(EXTENSIONS_LIST)" ; then \
          echo "        Extensions added are: $(EXTENSIONS_LIST)"; \

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -b -r1.464 -r1.465
--- configure.ac        30 Dec 2007 05:23:37 -0000      1.464
+++ configure.ac        30 Dec 2007 10:44:44 -0000      1.465
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.464 2007/12/30 05:23:37 rsavoye Exp $
+dnl $Id: configure.ac,v 1.465 2007/12/30 10:44:44 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1370,6 +1370,26 @@
   AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based 
GUI!"])
 fi
 
+if test x$kparts = xyes; then
+
+  KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
+  AC_SUBST(KDE_PLUGINDIR)
+  AC_ARG_WITH(kde-plugindir,
+    AC_HELP_STRING([--with-kde-plugindir=DIR],
+      [Directory to install KDE plugin in]),
+    [KDE_PLUGINDIR=${withval}]
+  )
+
+  KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
+  AC_SUBST(KDE_SERVICESDIR)
+  AC_ARG_WITH(kde-servicesdir,
+    AC_HELP_STRING([--with-kde-servicesdir=DIR],
+      [Directory to install KDE service in]),
+    [KDE_SERVICESDIR=${withval}]
+  )
+
+fi
+
 AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
 AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
 AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
@@ -1855,15 +1875,18 @@
 fi
 
 if test x"$nsapi" = x"yes"; then
-  echo "        Firefox plugin enabled (default). Use --disable-nsapi to 
disable."
+  echo "        NPAPI plugin enabled (default). Use --disable-nsapi to 
disable."
+  echo "            NPAPI plugin will be installed in ${FIREFOX_PLUGINS}"
 else
-  echo "        Firefox plugin disabled."
+  echo "        NPAPI plugin disabled."
 fi
 
 if test x"$kparts" = x"yes"; then
-  echo "        Konqueror plugin enabled (default). Use --disable-kparts to 
disable"
+  echo "        KPARTS plugin enabled (default). Use --disable-kparts to 
disable"
+  echo "            KDE plugin will be installed in ${KDE_PLUGINDIR}"
+  echo "            KDE service will be installed in ${KDE_SERVICESDIR}"
 else
-  echo "        Konqueror plugin disabled."
+  echo "        KPARTS plugin disabled."
 fi
 
 dnl -- if test x"${dynamic_gui}" = x"yes"; then

Index: doc/C/usermanual/installation/custompath_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/C/usermanual/installation/custompath_configuration.xml  16 Aug 2007 
14:27:35 -0000      1.4
+++ doc/C/usermanual/installation/custompath_configuration.xml  30 Dec 2007 
10:44:45 -0000      1.5
@@ -144,7 +144,21 @@
     <option>--with-plugindir</option>
     </entry>
       <entry>
-        This is the directory to install the Firefox plugin in.
+        This is the directory to install the NPAPI (Mozilla) plugin in.
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-kde-plugindir</option>
+    </entry>
+      <entry>
+        This is the directory to install the KPARTS (kde) plugin in.
+      </entry>
+  </row><row>
+  <entry>
+    <option>--with-kde-servicesdir</option>
+    </entry>
+      <entry>
+        This is the directory to install the KPARTS (kde) service in.
       </entry>
   </row><row>
   <entry>

Index: doc/C/usermanual/installation/feature_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/feature_configuration.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- doc/C/usermanual/installation/feature_configuration.xml     26 Aug 2007 
10:23:48 -0000      1.15
+++ doc/C/usermanual/installation/feature_configuration.xml     30 Dec 2007 
10:44:45 -0000      1.16
@@ -179,13 +179,29 @@
       </para></entry>
 </row>
 <row>
-  <entry><option>--disable-plugin</option>
-</entry>
-  <entry>Enable building the plugin. By default the
-        Mozilla Firefox plugin is built if all the required
-        files are found by configure. Specify the 
+  <entry>
+    <option>--disable-nsapi</option>
+    <option>--enable-nsapi</option>
+  </entry>
+  <entry>Force disable/enable building the NPAPI plugin.
+         By default the Mozilla plugin is built if the GTK gui 
+         is selected.  Specify the 
         <option>--with-plugindir=</option> option to specify where the
-        plugin should be installed.</entry>
+         plugin should be installed.
+   </entry>
+</row>
+<row>
+  <entry>
+     <option>--disable-kparts</option>
+     <option>--enable-kparts</option>
+  </entry>
+  <entry>Force disable/enable building the KPARTS plugin. By default the
+        KDE plugin is built if the kde gui is selected. 
+        Specify the <option>--with-kde-plugindir=</option> and
+        <option>--with-kde-servicesdir=</option> options to specify where the
+        plugin should be installed. The default installation dir is extracted
+        from kde-config.
+  </entry>
 </row>
 <row>
   <entry>    <option>--enable-qtopia</option>

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/firefox.m4   18 Aug 2007 09:53:35 -0000      1.27
+++ macros/firefox.m4   30 Dec 2007 10:44:45 -0000      1.28
@@ -36,7 +36,7 @@
   FIREFOX_PLUGINS=""
   if test x"${nsapi}" = x"yes"; then
 
-    AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory 
to install Firefox plugin in]),
+    AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory 
to install NPAPI plugin in]),
       [FIREFOX_PLUGINS=$withval]
     )
 

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- plugin/klash/Makefile.am    29 Dec 2007 13:54:48 -0000      1.36
+++ plugin/klash/Makefile.am    30 Dec 2007 10:44:45 -0000      1.37
@@ -15,15 +15,15 @@
 # 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.36 2007/12/29 13:54:48 strk Exp $
+# $Id: Makefile.am,v 1.37 2007/12/30 10:44:45 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 if KPARTS
 AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
 
-plugindir   = `$(KDE_CONFIG) --install module --expandvars` # $(libdir)/kde3
-kde_servicesdir = `$(KDE_CONFIG) --install services --expandvars` # 
$(prefix)/share/services
+plugindir   = $(KDE_PLUGINDIR)
+kde_servicesdir = $(KDE_SERVICESDIR)
 rcdir       = $(prefix)/share/apps/klash
 appsdatadir = $(prefix)/share/apps/klash
 configdir = $(prefix)/share/config