CVS: sylpheedclaws/plugins/gtkhtml2_viewer configure.ac,1.1.2.12,1.1.2.13

Update of /pack/anoncvs/sylpheedclaws/plugins/gtkhtml2_viewer
In directory sunsite.dk:/tmp/cvs-serv1595/gtkhtml2_viewer

Modified Files:
      Tag: gtk2
	configure.ac 
Log Message:
Fix bug #958 (Extra plugins define wrong SYLPHEED_CLAWS_PLUGINDIR when prefix is set)


Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/plugins/gtkhtml2_viewer/Attic/configure.ac,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- configure.ac	2006/04/26 22:31:37	1.1.2.12
+++ configure.ac	2006/05/30 16:42:54	1.1.2.13
@@ -36,6 +36,9 @@
 
 if test -z $prefix || test "${prefix}" == "NONE" ; then
   prefix=$( $PKG_CONFIG --variable=prefix sylpheed-claws )
+  SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
+else
+  SYLPHEED_CLAWS_PLUGINDIR='${libdir}/sylpheed-claws/plugins'
 fi
 localedir="${prefix}/share/locale"
 AC_ARG_WITH(localedir,
@@ -48,11 +51,6 @@
 PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.0.0.141)
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)
-if test -z $prefix || test "${prefix}" == "NONE" ; then
-  SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
-else
-  SYLPHEED_CLAWS_PLUGINDIR=${prefix}/lib/sylpheed-claws/plugins
-fi
 AC_SUBST(SYLPHEED_CLAWS_PLUGINDIR)
 
 dnl Check for GLib


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]