GNOME.org
 

[nautilus-actions] Fixing configure.ac

commit 112d570f5815232f612747d9ebf28df1ea4f0361
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu May 1 22:26:17 2014 +0200

    Fixing configure.ac

 configure.ac                 |   97 +++++++++++++++++++++++-------------------
 m4/na-default-io-provider.m4 |   18 ++++----
 2 files changed, 62 insertions(+), 53 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f3f3e2a..fc2a781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
 AM_GLIB_GNU_GETTEXT
 
 # a counter of fatal warnings emitted
-let fma_fatal_count=0
+let na_fatal_count=0
 
 # we are using pkgconfig for all development libraries we need
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -80,6 +80,58 @@ fi
 # Have and want GConf support ?
 NA_CHECK_FOR_GCONF
 
+# Oldest supported distribution as of Apr. 2013: Ubuntu 10 LTS (Gnome 2.30)
+glib_required=2.24.0
+gtk_required=2.20.0
+NA_CHECK_FOR_GTK
+NA_CHECK_MODULE([GLIB],    [glib-2.0 >= ${glib_required}])
+NA_CHECK_MODULE([GMODULE], [gmodule-2.0 >= ${glib_required}])
+
+# GDBus comes in GIO with 2.26
+# so uses GDBus if present, or fallback into dbus-glib-1
+NA_CHECK_FOR_GDBUS
+
+# other required libraries
+dnl aclocal complains if the comma is not just after the square bracket
+NA_CHECK_MODULE([GIO_UNIX],[gio-unix-2.0])
+NA_CHECK_MODULE([GTOP],    [libgtop-2.0 >= 2.23.1])
+NA_CHECK_MODULE([LIBXML],  [libxml-2.0 >= 2.6])
+NA_CHECK_MODULE([SM],      [sm >= 1.0])
+NA_CHECK_MODULE([ICE],     [ice])
+NA_CHECK_MODULE([UUID],    [uuid])
+
+# GLib marshaling
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
+if test "${GLIB_GENMARSHAL}" = "no"; then
+       AC_MSG_WARN([glib2-devel installed, but glib-genmarshal not found])
+       let na_fatal_count+=1
+fi
+
+##
+## Nautilus file-manager
+##
+NA_CHECK_MODULE([NAUTILUS_EXTENSION],[libnautilus-extension >= 2.16])
+#
+# when working in a test environment, nautilus extensions are typically
+# installed in a non-standard location ; lets specify this location here
+NA_NAUTILUS_EXTDIR
+#
+# Check for menu update function
+AC_CHECK_LIB([nautilus-extension],[nautilus_menu_item_new])
+AC_CHECK_FUNCS([nautilus_menu_provider_emit_items_updated_signal])
+#
+# starting with 2.91.90, Nautilus no more allows extensions to add toolbar items
+AC_CHECK_FUNCS([nautilus_menu_provider_get_toolbar_items])
+
+AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
+AC_SUBST([NAUTILUS_ACTIONS_LIBS])
+
+# defines a log domain for each component
+NA_LOG_DOMAINS
+
+# add --with-default-io-provider option
+NA_SET_DEFAULT_IO_PROVIDER([io-desktop])
+
 ###
 
 AC_CONFIG_FILES([
@@ -114,36 +166,9 @@ AC_CONFIG_FILES([
        maintainer/Makefile
 ])
 
-# GLib marshaling
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 # Enable deprecated functions ?
 NA_MAINTAINER_CHECK_FOR_DEPRECATED
 
-# Oldest supported distribution: Ubuntu 10 LTS (Gnome 2.30): april 2013
-glib_required=2.24.0
-gtk_required=2.20.0
-NA_CHECK_FOR_GTK
-
-# GDBus comes in GIO with 2.26
-# so uses GDBus if present, or fallback into dbus-glib-1
-NA_CHECK_MODULE([GLIB],   [glib-2.0 >= ${glib_required}])
-NA_CHECK_MODULE([GMODULE],[gmodule-2.0 >= ${glib_required}])
-NA_CHECK_FOR_GDBUS
-
-dnl aclocal complains if the comma is not just after the square bracket
-NA_CHECK_MODULE([GCONF],             [gconf-2.0 >= 2.8.0])
-NA_CHECK_MODULE([GIO_UNIX],          [gio-unix-2.0])
-NA_CHECK_MODULE([GTOP],              [libgtop-2.0 >= 2.23.1])
-NA_CHECK_MODULE([LIBXML],            [libxml-2.0 >= 2.6])
-NA_CHECK_MODULE([SM],                [sm >= 1.0])
-NA_CHECK_MODULE([ICE],               [ice])
-NA_CHECK_MODULE([UUID],              [uuid])
-NA_CHECK_MODULE([NAUTILUS_EXTENSION],[libnautilus-extension >= 2.16])
-
-AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
-AC_SUBST([NAUTILUS_ACTIONS_LIBS])
-
 # check for gtk-doc
 # - starting with gtk-doc 1.16, is able to handle srcdir != builddir
 # - API documentation should not be built (would be incomplete) when deprecated
@@ -158,29 +183,13 @@ fi
 #   compile the tarball distribution (i.e. without regenerating users's manuals)
 GNOME_DOC_INIT(,,[gdu_cv_have_gdu=no])
 
-# defines log domains when in maintainer mode
-NA_LOG_DOMAINS
-
 # add --enable-html-manuals and --enable-pdf-manuals configure options
 NA_ENABLE_MANUALS
 
-# add --with-default-io-provider option
-NA_SET_DEFAULT_IO_PROVIDER([na-desktop])
-
-# when working in a test environment, nautilus extensions are typically
-# installed in a non-standard location ; lets specify this location here
-NA_NAUTILUS_EXTDIR
-
 # define NA_MAINTAINER_MODE variable
 NA_MAINTAINER_CHECK_MODE
 AC_DEFINE([NAUTILUS_ACTIONS_DEBUG],["NAUTILUS_ACTIONS_DEBUG"],[Debug environment variable])
 
-# Check for menu update function
-AC_CHECK_LIB([nautilus-extension],[nautilus_menu_item_new])
-AC_CHECK_FUNCS([nautilus_menu_provider_emit_items_updated_signal])
-# starting with 2.91.90, Nautilus no more allows extensions to add toolbar items
-AC_CHECK_FUNCS([nautilus_menu_provider_get_toolbar_items])
-
 # display and keep configuration informations
 config_options="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
 AC_DEFINE_UNQUOTED([NA_CONFIG_OPTIONS],["$0 ${config_options}"],["Configure options"])
diff --git a/m4/na-default-io-provider.m4 b/m4/na-default-io-provider.m4
index 5241c6a..02b123b 100644
--- a/m4/na-default-io-provider.m4
+++ b/m4/na-default-io-provider.m4
@@ -25,18 +25,18 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-# serial 1 creation
+# serial 2 remove the input parameter
 
 dnl --with-default-io-provider=gconf|desktop
 dnl   Defines the default I/O Provider when creating a new action
-dnl   Default to 'desktop'
+dnl   Default to 'na-desktop'
 dnl
-dnl usage:  NA_SET_DEFAULT_IO_PROVIDER([default_io_provider])
+dnl configure.ac usage:  NA_SET_DEFAULT_IO_PROVIDER
 dnl
 dnl ac_define NA_DEFAULT_IO_PROVIDER variable
 
 AC_DEFUN([NA_SET_DEFAULT_IO_PROVIDER],[
-       _AC_ARG_NA_WITH_DEFAULT_IO_PROVIDER([$1])
+       _AC_ARG_NA_WITH_DEFAULT_IO_PROVIDER([na-desktop])
        _CHECK_FOR_DEFAULT_IO_PROVIDER
 ])
 
@@ -44,17 +44,17 @@ AC_DEFUN([_AC_ARG_NA_WITH_DEFAULT_IO_PROVIDER],[
        AC_ARG_WITH(
                [default-io-provider],
                AS_HELP_STRING(
-                       [--with-default-io-provider@<:@=na-gconf|na-desktop@:>@],
+                       [--with-default-io-provider<provider>],
                        [define default I/O provider  @<:@$1@:>@]),
-                       [with_default_io_provider=$withval],
-                       [with_default_io_provider="$1"])
+               [with_default_io_provider=$withval],
+               [with_default_io_provider="$1"])
 ])
 
 AC_DEFUN([_CHECK_FOR_DEFAULT_IO_PROVIDER],[
        AC_MSG_CHECKING([for default I/O provider on new items])
        AC_MSG_RESULT([${with_default_io_provider}])
-       if test "x${with_default_io_provider}" != "xna-gconf"; then
-               if test "x${with_default_io_provider}" != "xna-desktop"; then
+       if test "${with_default_io_provider}" != "na-gconf"; then
+               if test "${with_default_io_provider}" != "na-desktop"; then
                        AC_MSG_ERROR([a default I/O provider must be specified, must be 'na-gconf' or 
'na-desktop'])
                fi
        fi
diff --git a/maintainer/run-autogen.sh b/maintainer/run-autogen.sh
old mode 100644
new mode 100755
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]