[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4 |
Date: |
Fri, 14 Mar 2008 23:50:03 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/03/14 23:50:03
Modified files:
. : configure.ac ChangeLog
macros : kde.m4
Log message:
* macros/kde.m4: Set plugin paths here instead of configure.ac.
* configure.ac: Move Kparts config code to kde.m4. Default to
$HOME/.kde instead of system wide, fixing all installation
permissions problems.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.494&r2=1.495
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5920&r2=1.5921
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.42&r2=1.43
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -b -r1.494 -r1.495
--- configure.ac 12 Mar 2008 03:46:02 -0000 1.494
+++ configure.ac 14 Mar 2008 23:50:00 -0000 1.495
@@ -1402,62 +1402,6 @@
AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based
GUI!"])
fi
-if test x$kparts = xyes; then
- AC_ARG_WITH(kde-pluginprefix,
- AC_HELP_STRING([--with-kde-pluginprefix=DIR],
- [Prefix for KDE plugin, like /usr]),
- [KDE_PLUGINPREFIX=${withval}]
- )
-
- if test $KDE_PLUGINPREFIX; then
- KDE_PLUGINDIR=$KDE_PLUGINPREFIX'/lib/kde3'
- KDE_SERVICESDIR=$KDE_PLUGINPREFIX'/share/services'
- KDE_CONFIGDIR=$KDE_PLUGINPREFIX'/share/config'
- KDE_APPSDATADIR=$KDE_PLUGINPREFIX'/share/apps/klash'
- else
- if test x${KDE_CONFIG} != x; then
- KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
- KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
- KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
- KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`'/klash'
- else
- KDE_PLUGINDIR='$(libdir)/kde3'
- KDE_SERVICESDIR='$(prefix)/share/services'
- KDE_CONFIGDIR='$(prefix)/share/config'
- KDE_APPSDATADIR='$(prefix)/share/apps/klash'
- fi
- fi
-
- AC_SUBST(KDE_PLUGINDIR)
- AC_SUBST(KDE_SERVICESDIR)
- AC_SUBST(KDE_CONFIGDIR)
- AC_SUBST(KDE_APPSDATADIR)
-
- AC_ARG_WITH(kde-plugindir,
- AC_HELP_STRING([--with-kde-plugindir=DIR],
- [Directory to install KDE plugin in]),
- [KDE_PLUGINDIR=${withval}]
- )
-
- AC_ARG_WITH(kde-servicesdir,
- AC_HELP_STRING([--with-kde-servicesdir=DIR],
- [Directory to install KDE service in]),
- [KDE_SERVICESDIR=${withval}]
- )
-
- AC_ARG_WITH(kde-configdir,
- AC_HELP_STRING([--with-kde-configdir=DIR],
- [Directory to install KDE configfile in]),
- [KDE_CONFIGDIR=${withval}]
- )
-
- AC_ARG_WITH(kde-appsdatadir,
- AC_HELP_STRING([--with-kde-appsdatadir=DIR],
- [Directory to install KDE data in]),
- [KDE_APPSDATADIR=${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 ])
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5920
retrieving revision 1.5921
diff -u -b -r1.5920 -r1.5921
--- ChangeLog 14 Mar 2008 23:05:58 -0000 1.5920
+++ ChangeLog 14 Mar 2008 23:50:01 -0000 1.5921
@@ -1,3 +1,10 @@
+2008-03-14 Rob Savoye <address@hidden>
+
+ * macros/kde.m4: Set plugin paths here instead of configure.ac.
+ * configure.ac: Move Kparts config code to kde.m4. Default to
+ $HOME/.kde instead of system wide, fixing all installation
+ permissions problems.
+
2008-03-14 Sandro Santilli <address@hidden>
* server/as_environment.cpp: when dumping local registers and
@@ -39,6 +46,7 @@
* libbase/tree.hh: update to version 2.51
* server/movie_root.cpp: tinker with the tree a bit more.
+>>>>>>> 1.5920
2008-03-14 Benjamin Wolsey <address@hidden>
* server/movie_root.{h,cpp}: add getMovieInfo() to fill the info tree
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- macros/kde.m4 28 Nov 2007 22:28:53 -0000 1.42
+++ macros/kde.m4 14 Mar 2008 23:50:02 -0000 1.43
@@ -29,6 +29,32 @@
fi
])
+
+ AC_ARG_WITH(kde-plugindir,
+ AC_HELP_STRING([--with-kde-plugindir=DIR], [Directory to install KDE
plugin in]),
+ [KDE_PLUGINDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-servicesdir, AC_HELP_STRING([--with-kde-servicesdir=DIR],
+ [Directory to install KDE service in]),
+ [KDE_SERVICESDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-configdir, AC_HELP_STRING([--with-kde-configdir=DIR],
+ [Directory to install KDE configfile in]),
+ [KDE_CONFIGDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-appsdatadir, AC_HELP_STRING([--with-kde-appsdatadir=DIR],
+ [Directory to install KDE data in]),
+ [KDE_APPSDATADIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-pluginprefix, AC_HELP_STRING([--with-kde-pluginprefix=DIR],
+ [Prefix for KDE plugin, like /usr]),
+ [KDE_PLUGINPREFIX=${withval}
+ ])
+
kde_prefix="/usr"
has_kde=no
if test x"${ac_cv_path_kde_incl}" = x; then
@@ -78,7 +104,6 @@
KDE_CFLAGS=""
fi
-dnl # KDE_LIBS = -lkdeui -lkdecore -lkdeprint -L/usr/lib/qt-3.3/lib -lqt-mt
dnl Look for the libraries
AC_ARG_WITH(kde_lib, AC_HELP_STRING([--with-kde-lib], [directory where kde
libraries are]), with_kde_lib=${withval})
AC_CACHE_VAL(ac_cv_path_kde_lib, [
@@ -146,10 +171,25 @@
KLASH_PLUGIN=
-
AC_SUBST(KLASH_PLUGIN)
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
+
+ dnl If building the kparts plugin, get the install paths correct.
+ if test x$kparts = xyes; then
+ if test x$KDE_PLUGINPREFIX = x; then
+ KDE_PLUGINPREFIX=${HOME}/.kde
+ fi
+ KDE_PLUGINDIR=$KDE_PLUGINPREFIX'/lib/kde3'
+ KDE_SERVICESDIR=$KDE_PLUGINPREFIX'/share/services'
+ KDE_CONFIGDIR=$KDE_PLUGINPREFIX'/share/config'
+ KDE_APPSDATADIR=$KDE_PLUGINPREFIX'/share/apps/klash'
+ fi
+
+ AC_SUBST(KDE_PLUGINDIR)
+ AC_SUBST(KDE_SERVICESDIR)
+ AC_SUBST(KDE_CONFIGDIR)
+ AC_SUBST(KDE_APPSDATADIR)
])
# Local Variables:
- [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4,
Rob Savoye <=
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, strk, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, Rob Savoye, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, strk, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, Rob Savoye, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, strk, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, Rob Savoye, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, strk, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, Rob Savoye, 2008/03/15
- Re: [Gnash-commit] gnash configure.ac ChangeLog macros/kde.m4, Dossy Shiobara, 2008/03/15