[f-spot] Add --with-gnome-screensaver-privlibexecdir=DIR
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [f-spot] Add --with-gnome-screensaver-privlibexecdir=DIR
- Date: Wed, 2 Sep 2009 11:36:48 +0000 (UTC)
commit c1aec92df1b8115ae975fd35ba9d83bd9de2eceb
Author: Loïc Minier <lool dooz org>
Date: Wed Sep 2 11:15:45 2009 +0200
Add --with-gnome-screensaver-privlibexecdir=DIR
Add support for --with-gnome-screensaver-privlibexecdir=DIR and merge
the GNOME_SCREENSAVER_SAVERDIR= computing logic into the new
AC_ARG_WITH. This allows overriding the default
GNOME_SCREENSAVER_SAVERDIR when no gnome-screensaver bits are installed
and which is using libexec instead of lib on e.g. Debian/Ubuntu.
Signed-off-by: Stephane Delcroix <stephane delcroix org>
configure.ac | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f88f1ee..afe0191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,13 +235,16 @@ AC_ARG_WITH(gnome-screensaver,
gnome_screensaver_prefix=$prefix
fi)
-if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_SAVERDIR=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
-elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver/gnome-screensaver
-else
- GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
-fi
+AC_ARG_WITH(gnome-screensaver-privlibexecdir,
+ [ --with-gnome-screensaver-privlibexecdir=DIR set gnome-screensaver privlibexecdir],
+ GNOME_SCREENSAVER_SAVERDIR=$with_gnome_screensaver_privlibexecdir,
+ if test "$have_gs_pkgconfig" = "yes"; then
+ GNOME_SCREENSAVER_SAVERDIR=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
+ elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver
+ else
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
+ fi)
if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
GNOME_SCREENSAVER_THEMESDIR=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]