Index: plugins/nautilus-ext/Makefile.am
===================================================================
--- plugins/nautilus-ext/Makefile.am	(revision 2024)
+++ plugins/nautilus-ext/Makefile.am	(working copy)
@@ -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
 
Index: configure.in
===================================================================
--- configure.in	(revision 2024)
+++ configure.in	(working copy)
@@ -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")
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2024)
+++ ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2008-01-01  Brian Pepple  <bpepple@fedoraproject.org>
+
+	* plugins/nautilus-ext/Makefile.am (nautilus_extensiondir): 
+	* configure.in (NAUTILUS_LIBS): Fetch nautilus extension
+	dir from libnautilus-extension.pc
+
 2008-01-01  Adam Schreiber  <sadam@clemson.edu>
     
     * src/seahorse-key-manager-store.c:
