Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=fddb14d43ded197db88932d8735a78a3ba8feaac
commit fddb14d43ded197db88932d8735a78a3ba8feaac Author: Priyank <priy...@frugalware.org> Date: Sat Jun 13 00:37:51 2009 +0530 configure.ac: Fixes (thanks to hermier) diff --git a/configure.ac b/configure.ac index 4abd1eb..2af6ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,9 @@ AC_HEADER_STDC AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h]) AC_ARG_ENABLE(nautilus-extension, - AC_HELP_STRING([ --enable-nautilus-extension], [Enable nautilus extension]), [nautilusext="yes"]) + AC_HELP_STRING([ --enable-nautilus-extension], [Enable nautilus extension]), [nautilusext="yes"], [nautilusext="no"]) AC_ARG_ENABLE(thunar-plugin, - AC_HELP_STRING([ --enable-thunar-plugin], [Enable thunar plugin]), [thunarplugin="yes"]) + AC_HELP_STRING([ --enable-thunar-plugin], [Enable thunar plugin]), [thunarplugin="yes"], [thunarplugin="no"]) AC_ARG_ENABLE(icmonitor, AC_HELP_STRING([ --enable-icmonitor], [Enable iconcache monitor support]), [icmonitor="yes"]) AC_ARG_ENABLE(werror, @@ -36,37 +36,33 @@ PKG_CHECK_MODULES([GFPM], [$pkg_modules]) dnl Check if nautilus extension is to be built AC_MSG_CHECKING(whether nautilus extension is enabled) -if test "x$nautilusext" = "xyes"; then - nautilusext=yes +AM_CONDITIONAL([NAUTILUS_EXT],[test "x$nautilusext" = "xyes"]) +if test "$NAUTILUS_EXT" = yes; then AC_MSG_RESULT(yes) - PKG_CHECK_MODULES(NAUTILUS_EXT_GFPM,libnautilus-extension >= 2.13.3) + PKG_CHECK_MODULES([NAUTILUS_EXT_GFPM],[libnautilus-extension >= 2.13.3]) AC_SUBST(NAUTILUS_EXT_GFPM_CFLAGS) AC_SUBST(NAUTILUS_EXT_GFPM_LIBS) NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` AC_SUBST(NAUTILUS_EXTENSION_DIR) AC_DEFINE(HAVE_NAUTILUS_EXT, 1, [Building nautilus extension]) else - nautilusext=no AC_MSG_RESULT(no) fi -AM_CONDITIONAL([HAVE_NAUTILUS_EXT],[test "x$nautilusext" = "xyes"]) dnl Check if thunar plugin is to be built AC_MSG_CHECKING(whether thunar plugin is enabled) -if test "x$thunarplugin" = "xyes"; then - thunarplugin=yes +AM_CONDITIONAL([THUNAR_PLUGIN],[test "x$thunarplugin" = "xyes"]) +if test "$THUNAR_PLUGIN" = yes; then AC_MSG_RESULT(yes) - PKG_CHECK_MODULES(THUNAR_PLUGIN_GFPM,thunar-vfs-1 thunarx-1) + PKG_CHECK_MODULES([THUNAR_PLUGIN_GFPM],[thunar-vfs-1 thunarx-1]) AC_SUBST(THUNAR_PLUGIN_GFPM_CFLAGS) AC_SUBST(THUNAR_PLUGIN_GFPM_LIBS) THUNAR_EXTENSION_DIR=`$PKG_CONFIG --variable=extensionsdir thunarx-1` AC_SUBST(THUNAR_EXTENSION_DIR) AC_DEFINE(HAVE_THUNAR_PLUGIN, 1, [Building thunar plugin]) else - thunarplugin=no AC_MSG_RESULT(no) fi -AM_CONDITIONAL([HAVE_THUNAR_PLUGIN],[test $thunarplugin = yes]) 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 42901cc..57f2903 100644 --- a/nautilus-extension/Makefile.am +++ b/nautilus-extension/Makefile.am @@ -1,7 +1,8 @@ +if NAUTILUS_EXT INCLUDES = $(NAUTILUS_EXT_GFPM_CFLAGS) nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) -nautilus_extension_LTLIBRARIES=libnautilus-gfpm.la +lib_LTLIBRARIES=libnautilus-gfpm.la libnautilus_gfpm_la_SOURCES = \ nautilus-gfpm.c \ nautilus-gfpm.h \ @@ -10,4 +11,5 @@ 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 f23520e..9a2b6c7 100644 --- a/thunar-plugin/Makefile.am +++ b/thunar-plugin/Makefile.am @@ -1,7 +1,8 @@ +if THUNAR_PLUGIN INCLUDES = $(THUNAR_PLUGIN_GFPM_CFLAGS) extensiondir=$(THUNAR_EXTENSION_DIR) -extension_LTLIBRARIES=libthunar-gfpm.la +lib_LTLIBRARIES=libthunar-gfpm.la libthunar_gfpm_la_SOURCES = \ thunar-gfpm.c \ thunar-gfpm.h \ @@ -11,4 +12,5 @@ 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 56de0a0..7a3107c 100644 --- a/thunar-plugin/thunar-gfpm.c +++ b/thunar-plugin/thunar-gfpm.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_THUNAR_PLUGIN + #define _GNU_SOURCE #include <stdio.h> #include <config.h> @@ -29,8 +31,6 @@ #include <thunarx/thunarx.h> #include "thunar-gfpm.h" -#ifdef HAVE_THUNAR_PLUGIN - static GObjectClass *parent_class; static GtkWidget * _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
