[f-spot] Clean up gs_pc_* and g_ss_prefix vars handling
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [f-spot] Clean up gs_pc_* and g_ss_prefix vars handling
- Date: Wed, 2 Sep 2009 11:36:43 +0000 (UTC)
commit 7fa016201bc958464551089614c76a69e2d6101a
Author: Loïc Minier <lool dooz org>
Date: Wed Sep 2 11:28:14 2009 +0200
Clean up gs_pc_* and g_ss_prefix vars handling
Always set gnome_screensaver_prefix to the prefix from the .pc file
instead of $prefix if it's being autodetected and the .pc file is
available. Drop gs_pc_* vars which were only used once.
Signed-off-by: Stephane Delcroix <stephane delcroix org>
configure.ac | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7507f29..f88f1ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,20 +224,19 @@ if test "x$with_turtle" != "xno"; then
AC_SUBST(TURTLEDIR)
fi
+PKG_CHECK_EXISTS(gnome-screensaver, have_gs_pkgconfig=yes, have_gs_pkgconfig=no)
+
AC_ARG_WITH(gnome-screensaver,
[ --with-gnome-screensaver=PREFIX set gnome gnome-screensaver prefix],
gnome_screensaver_prefix=$with_gnome_screensaver,
- gnome_screensaver_prefix=$prefix)
-
-PKG_CHECK_EXISTS(gnome-screensaver, have_gs_pkgconfig=yes, have_gs_pkgconfig=no)
-if test "$have_gs_pkgconfig" = "yes"; then
- gs_pc_prefix=`$PKG_CONFIG --variable=prefix gnome-screensaver`
- gs_pc_saverdir=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
- gs_pc_themesdir=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
-fi
+ if test "$have_gs_pkgconfig" = "yes"; then
+ gnome_screensaver_prefix=`$PKG_CONFIG --variable=prefix gnome-screensaver`
+ else
+ gnome_screensaver_prefix=$prefix
+ fi)
if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
+ 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
@@ -245,7 +244,7 @@ else
fi
if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
- GNOME_SCREENSAVER_THEMESDIR=$gs_pc_themesdir
+ GNOME_SCREENSAVER_THEMESDIR=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
else
GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]