Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=a610ea69039e5c2027e6af7a048a13e41670354e
commit a610ea69039e5c2027e6af7a048a13e41670354e Author: Priyank <priy...@frugalware.org> Date: Sat Jun 13 12:04:05 2009 +0530 Fixes in --enable-thunar-plugin and --enable-nautilus-extension args handling diff --git a/Makefile.am b/Makefile.am index 7f50c89..3992f84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,14 @@ -SUBDIRS = src nautilus-extension thunar-plugin data po +if THUNAR_PLUGIN +THUNAR_PLUGIN_SUBDIR = thunar-plugin +endif + +if NAUTILUS_EXT +NAUTILUS_EXT_SUBDIR = nautilus-extension +endif + +SUBDIRS = src \ + $(NAUTILUS_EXT_SUBDIR) \ + $(THUNAR_PLUGIN_SUBDIR) \ + data \ + po diff --git a/configure.ac b/configure.ac index 2af6ca1..fa3ea03 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,8 @@ PKG_CHECK_MODULES([GFPM], [$pkg_modules]) dnl Check if nautilus extension is to be built AC_MSG_CHECKING(whether nautilus extension is enabled) -AM_CONDITIONAL([NAUTILUS_EXT],[test "x$nautilusext" = "xyes"]) -if test "$NAUTILUS_EXT" = yes; then +if test "x$nautilusext" = "xyes"; then + nautilusext="yes" AC_MSG_RESULT(yes) PKG_CHECK_MODULES([NAUTILUS_EXT_GFPM],[libnautilus-extension >= 2.13.3]) AC_SUBST(NAUTILUS_EXT_GFPM_CFLAGS) @@ -46,13 +46,15 @@ if test "$NAUTILUS_EXT" = yes; then AC_SUBST(NAUTILUS_EXTENSION_DIR) AC_DEFINE(HAVE_NAUTILUS_EXT, 1, [Building nautilus extension]) else + nautilusext="no" AC_MSG_RESULT(no) fi +AM_CONDITIONAL([NAUTILUS_EXT],[test "x$nautilusext" = "xyes"]) dnl Check if thunar plugin is to be built AC_MSG_CHECKING(whether thunar plugin is enabled) -AM_CONDITIONAL([THUNAR_PLUGIN],[test "x$thunarplugin" = "xyes"]) -if test "$THUNAR_PLUGIN" = yes; then +if test "x$thunarplugin" = "xyes"; then + thunarplugin="yes" AC_MSG_RESULT(yes) PKG_CHECK_MODULES([THUNAR_PLUGIN_GFPM],[thunar-vfs-1 thunarx-1]) AC_SUBST(THUNAR_PLUGIN_GFPM_CFLAGS) @@ -61,8 +63,10 @@ if test "$THUNAR_PLUGIN" = yes; then AC_SUBST(THUNAR_EXTENSION_DIR) AC_DEFINE(HAVE_THUNAR_PLUGIN, 1, [Building thunar plugin]) else + thunarplugin="no" AC_MSG_RESULT(no) fi +AM_CONDITIONAL([THUNAR_PLUGIN],[test "x$thunarplugin" = "xyes"]) dnl Check for Iconcache monitor support AC_MSG_CHECKING(for iconcache monitor support) diff --git a/nautilus-extension/Makefile.am b/nautilus-extension/Makefile.am index 57f2903..68f22dd 100644 --- a/nautilus-extension/Makefile.am +++ b/nautilus-extension/Makefile.am @@ -1,4 +1,3 @@ -if NAUTILUS_EXT INCLUDES = $(NAUTILUS_EXT_GFPM_CFLAGS) nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) @@ -11,5 +10,4 @@ libnautilus_gfpm_la_SOURCES = \ libnautilus_gfpm_la_LDFLAGS = -module -avoid-version -no-undefined libnautilus_gfpm_la_LIBADD = $(NAUTILUS_EXT_GFPM_LIBS) -lpacman -endif diff --git a/thunar-plugin/Makefile.am b/thunar-plugin/Makefile.am index 9a2b6c7..76840e6 100644 --- a/thunar-plugin/Makefile.am +++ b/thunar-plugin/Makefile.am @@ -1,8 +1,7 @@ -if THUNAR_PLUGIN INCLUDES = $(THUNAR_PLUGIN_GFPM_CFLAGS) -extensiondir=$(THUNAR_EXTENSION_DIR) -lib_LTLIBRARIES=libthunar-gfpm.la +extensionsdir = $(THUNAR_EXTENSION_DIR) +extensions_LTLIBRARIES = libthunar-gfpm.la libthunar_gfpm_la_SOURCES = \ thunar-gfpm.c \ thunar-gfpm.h \ @@ -12,5 +11,3 @@ libthunar_gfpm_la_LDFLAGS = -module -avoid-version -no-undefined libthunar_gfpm_la_LIBADD = $(THUNAR_PLUGIN_GFPM_LIBS) -lpacman -endif - diff --git a/thunar-plugin/thunar-gfpm.c b/thunar-plugin/thunar-gfpm.c index 7a3107c..e5550cf 100644 --- a/thunar-plugin/thunar-gfpm.c +++ b/thunar-plugin/thunar-gfpm.c @@ -18,11 +18,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <config.h> + #ifdef HAVE_THUNAR_PLUGIN #define _GNU_SOURCE #include <stdio.h> -#include <config.h> #include <string.h> #include <pacman.h> #include <gtk/gtk.h> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
