f-spot r3934 - trunk

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon May 19 12:15:23 2008
New Revision: 3934
URL: http://svn.gnome.org/viewvc/f-spot?rev=3934&view=rev

Log:
2008-05-19  Stephane Delcroix  <sdelcroix novell com>

	* configure.in: install screensaver in the right directory. 
	Fixes bgo #348323.


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon May 19 12:15:23 2008
@@ -262,13 +262,26 @@
 	gnome_screensaver_prefix=$prefix		   
 fi
 
-if test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
+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" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
+	GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
+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
 
-GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
+	GNOME_SCREENSAVER_THEMESDIR=$gs_pc_themesdir
+else
+	GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+fi
 
 AC_SUBST(GNOME_SCREENSAVER_SAVERDIR)
 AC_SUBST(GNOME_SCREENSAVER_THEMESDIR)