[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/i...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/30 11:03:50

Modified files:
        .              : ChangeLog configure.ac 
        doc/C/usermanual/installation: custompath_configuration.xml 

Log message:
        Fallback to old installation path for kparts plugin if kde-config is
        not found. Document defaults for both kparts and npapi plugins.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5274&r2=1.5275
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.465&r2=1.466
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5274
retrieving revision 1.5275
diff -u -b -r1.5274 -r1.5275
--- ChangeLog   30 Dec 2007 10:44:43 -0000      1.5274
+++ ChangeLog   30 Dec 2007 11:03:49 -0000      1.5275
@@ -1,5 +1,13 @@
 2007-12-30 Sandro Santilli <address@hidden>
 
+       * configure.ac,
+         doc/C/usermanual/installation/custompath_configuration.xml:
+         Fallback to old installation path for kparts plugin if kde-config
+         is not found. Document defaults for both kparts and npapi
+         plugins.
+
+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,

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- configure.ac        30 Dec 2007 10:44:44 -0000      1.465
+++ configure.ac        30 Dec 2007 11:03:50 -0000      1.466
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.465 2007/12/30 10:44:44 strk Exp $
+dnl $Id: configure.ac,v 1.466 2007/12/30 11:03:50 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1372,16 +1372,23 @@
 
 if test x$kparts = xyes; then
 
-  KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
+  KDE_PLUGINDIR='$(libdir)/kde3'
+  KDE_SERVICESDIR='$(prefix)/share/services'
+
   AC_SUBST(KDE_PLUGINDIR)
+  AC_SUBST(KDE_SERVICESDIR)
+
+  if test x${KDE_CONFIG} != x; then
+     KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
+     KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
+  fi
+
   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]),

Index: doc/C/usermanual/installation/custompath_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/C/usermanual/installation/custompath_configuration.xml  30 Dec 2007 
10:44:45 -0000      1.5
+++ doc/C/usermanual/installation/custompath_configuration.xml  30 Dec 2007 
11:03:50 -0000      1.6
@@ -145,6 +145,7 @@
     </entry>
       <entry>
         This is the directory to install the NPAPI (Mozilla) plugin in.
+        By default it goes to ~/.mozilla/plugins.
       </entry>
   </row><row>
   <entry>
@@ -152,6 +153,8 @@
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) plugin in.
+        By default it is what's returned by kde-config --install module 
--expandvars,
+        or $(prefix)/share/services if kde-config is not found.
       </entry>
   </row><row>
   <entry>
@@ -159,6 +162,8 @@
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) service in.
+        By default it is what's returned by kde-config --install services 
--expandvars,
+        or $(libdir)/kde3 if kde-config is not found.
       </entry>
   </row><row>
   <entry>