[totem] Fix distchecking problems with the nautilus extension

[Bastien Nocera <hadess src gnome org>]

commit 28e06939ad317d549fa6052f77697309d6a1f701
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Nov 30 18:48:51 2009 +0000

    Fix distchecking problems with the nautilus extension

 Makefile.am  |    2 +-
 configure.in |   12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4dab38e..f81a37d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
 		 gnome-doc-utils.make
 
 DIST_SUBDIRS = $(SUBDIRS) browser-plugin
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
 
 # Build ChangeLog from GIT history
 ChangeLog:
diff --git a/configure.in b/configure.in
index 26bb81e..3697b64 100644
--- a/configure.in
+++ b/configure.in
@@ -711,13 +711,23 @@ if test x$ENABLE_NAUTILUS = "xyes" ; then
 			[HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no])
 fi
 
+AC_ARG_WITH(nautilusdir,
+	    AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]),
+	    [ac_with_nautilusdir=$withval],
+	    [ac_with_nautilusdir=""])
+
 NAUTILUS_LIBS="$NAUTILUS_LIBS $EXTRA_BACKEND_LIBS"
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 if test x$HAVE_NAUTILUS = "xyes"; then
 	AC_DEFINE(HAVE_NAUTILUS, 1, [defined if you build the nautilus plugin])
-	NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+	if test "${ac_with_nautilusdir}" = ""; then
+		ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+	fi
 	AC_SUBST(NAUTILUSDIR)
+	AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}])
+	AC_SUBST([NAUTILUSDIR],[${ac_with_nautilusdir}])
+
 fi
 AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")