nautilus-python r50 - in trunk: . src

[johan svn gnome org]

Author: johan
Date: Fri Jan 11 14:17:16 2008
New Revision: 50
URL: http://svn.gnome.org/viewvc/nautilus-python?rev=50&view=rev

Log:
2008-01-01  Brian Pepple  <bpepple fedoraproject org>

	reviewed by: Johan Dahlin

	* src/Makefile.am (nautilus_extensiondir): 
	* configure.in (NAUTILUS_LIBDIR): Fetch nautilus
	extension dir from nautilus-extension.pc



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan 11 14:17:16 2008
@@ -22,6 +22,7 @@
 
 dnl Check for pkgconfig first
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 dnl Give error and exit if we don't have pkgconfig
 if test "x$HAVE_PKGCONFIG" = "xno"; then
@@ -54,6 +55,12 @@
 AC_SUBST(NAUTILUS_LIBDIR)
 AC_DEFINE_UNQUOTED(NAUTILUS_LIBDIR, "$NAUTILUS_LIBDIR", [Nautilus libdir])
 
+dnl ---------------------------------
+dnl Get nautilus extensions directory
+dnl ---------------------------------
+NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUS_EXTENSION_DIR)
+
 AC_OUTPUT([
   Makefile 
   nautilus-python.pc

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Jan 11 14:17:16 2008
@@ -10,7 +10,7 @@
 	-DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\""		\
 	$(PYTHON_INCLUDES)
 
-nautilus_extensiondir=$(NAUTILUS_LIBDIR)/nautilus/extensions-1.0
+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
 
 nautilus_extension_LTLIBRARIES = libnautilus-python.la