[gnome-user-share] Fix distcheck with the nautilus extension
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] Fix distcheck with the nautilus extension
- Date: Wed, 24 Feb 2010 10:51:05 +0000 (UTC)
commit 4ef8e1b5ab01a14daf1bf94311fca4aaa6297a7f
Author: Bastien Nocera <hadess hadess net>
Date: Wed Feb 24 10:33:12 2010 +0000
Fix distcheck with the nautilus extension
Makefile.am | 2 +-
configure.in | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ba0abca..c7031d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ DISTCLEANFILES = \
intltool-merge \
intltool-update
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
# Build ChangeLog from GIT history
ChangeLog:
diff --git a/configure.in b/configure.in
index 4110e59..a308b4b 100644
--- a/configure.in
+++ b/configure.in
@@ -130,10 +130,19 @@ AC_SUBST(MODULES_PATH)
dnl===========================================================================
dnl Check for nautilus for the share bar
+AC_ARG_WITH(nautilusdir,
+ AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]),
+ [ac_with_nautilusdir=$withval],
+ [ac_with_nautilusdir=""])
+
PKG_CHECK_MODULES(EXTENSION,
libnautilus-extension)
-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}])
dnl ==========================================================================
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]