seahorse r2031 - in trunk: . plugins/nautilus-ext

[sadam svn gnome org]

Author: sadam
Date: Mon Jan  7 18:17:33 2008
New Revision: 2031
URL: http://svn.gnome.org/viewvc/seahorse?rev=2031&view=rev

Log:
2008-01-07  Adam Schreiber  <sadam clemson edu>

	* plugins/nautilus-ext/Makefile.am (nautilus_extensiondir): 
	* configure.in (NAUTILUS_LIBS): Fetch nautilus extension
	dir from libnautilus-extension.pc.  Patch from Brian Pepple.  
	Fixes bug #505990


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/nautilus-ext/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 18:17:33 2008
@@ -1,3 +1,10 @@
+2008-01-07  Adam Schreiber  <sadam clemson edu>
+
+	* plugins/nautilus-ext/Makefile.am (nautilus_extensiondir): 
+	* configure.in (NAUTILUS_LIBS): Fetch nautilus extension
+	dir from libnautilus-extension.pc.  Patch from Brian Pepple.  
+	Fixes bug #505990
+
 2008-01-01  Adam Schreiber  <sadam clemson edu>
     
     * src/seahorse-key-manager-store.c:

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan  7 18:17:33 2008
@@ -41,6 +41,8 @@
 AC_CHECK_FUNCS(mlock)
 SEAHORSE_CHECK_MLOCK()
 
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
 PKG_CHECK_MODULES(SEAHORSE, libgnome-2.0 >= 2.14 libgnomeui-2.0 
                   libglade-2.0 gconf-2.0 gtk+-2.0 >= 2.10.0 gnome-vfs-2.0)
 
@@ -297,7 +299,7 @@
     echo "enabling nautilus plugin..."
     echo "checking for supported versions of nautilus..."
 
-    PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.9.0 glib-2.0 >= 2.10.0],
+    PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0],
                       [enable_nautilus=yes],[enable_nautilus=no])
 
     # The new Nautilus extension
@@ -306,6 +308,12 @@
         AC_SUBST(NAUTILUS_CFLAGS)
         AC_SUBST(NAUTILUS_LIBS)
     fi
+
+    # Fetch the extension directory
+    if test "$enable_nautilus" = "yes"; then
+	NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+	AC_SUBST(NAUTILUS_EXTENSION_DIR)
+    fi
 fi
 
 AM_CONDITIONAL(WITH_NAUTILUS_EXT, test "$with_nautilus_ext" = "yes")

Modified: trunk/plugins/nautilus-ext/Makefile.am
==============================================================================
--- trunk/plugins/nautilus-ext/Makefile.am	(original)
+++ trunk/plugins/nautilus-ext/Makefile.am	Mon Jan  7 18:17:33 2008
@@ -5,7 +5,7 @@
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 # There doesn't seem to be a way to get this dynamically
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
 
 nautilus_extension_LTLIBRARIES=libnautilus-seahorse.la