[f-spot] Add --with-gnome-screensaver-themesdir=DIR



commit 16f08070d7fb48fc096a9cfbca962c96d6a71661
Author: Loïc Minier <lool dooz org>
Date:   Wed Sep 2 11:19:49 2009 +0200

    Add --with-gnome-screensaver-themesdir=DIR
    
    Add support for --with-gnome-screensaver-themesdir=DIR and merge the
    GNOME_SCREENSAVER_THEMESDIR= computing logic into the new AC_ARG_WITH.
    This allows overriding the default GNOME_SCREENSAVER_THEMESDIR when no
    gnome-screensaver bits are installed and is consistent with the other
    options.
    
    Signed-off-by: Stephane Delcroix <stephane delcroix org>

 configure.ac |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index afe0191..265d231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,11 +246,14 @@ AC_ARG_WITH(gnome-screensaver-privlibexecdir,
         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`
-else
-	GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
-fi
+AC_ARG_WITH(gnome-screensaver-themesdir,
+    [ --with-gnome-screensaver-themesdir=DIR  set gnome-screensaver themesdir],
+    GNOME_SCREENSAVER_THEMESDIR=$with_gnome_screensaver_themesdir,
+    if test "$have_gs_pkgconfig" = "yes"; then
+        GNOME_SCREENSAVER_THEMESDIR=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
+    else
+        GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+    fi)
 
 AC_SUBST(GNOME_SCREENSAVER_SAVERDIR)
 AC_SUBST(GNOME_SCREENSAVER_THEMESDIR)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]