[nautilus-actions/file-manager-actions] configure.ac: updated accordingly
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] configure.ac: updated accordingly
- Date: Wed, 9 Sep 2015 11:25:52 +0000 (UTC)
commit 96e7a44e355488f11a5b94edf786111f587872c2
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Sep 9 11:20:09 2015 +0200
configure.ac: updated accordingly
configure.ac | 18 +++++++++---------
m4/fma-check-module.m4 | 10 +++++-----
2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c12468..8cc64cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,15 +95,15 @@ FMA_CHECK_FOR_GCONF
# As of 3.4 release, remove Gtk+2 support, only allowing for Gtk+3
dnl aclocal complains if the comma is not just after the square bracket
-NA_CHECK_MODULE([GTK3], [gtk+-3.0], [${gtk_required}])
-NA_CHECK_MODULE([GLIB], [glib-2.0], [${glib_required}])
-NA_CHECK_MODULE([GMODULE], [gmodule-2.0],[${glib_required}])
-NA_CHECK_MODULE([GIO_UNIX],[gio-unix-2.0])
-NA_CHECK_MODULE([GTOP], [libgtop-2.0],[${gtop_required}])
-NA_CHECK_MODULE([LIBXML], [libxml-2.0], [${xml_required}])
-NA_CHECK_MODULE([UUID], [uuid])
-NA_CHECK_MODULE([SM], [sm], [1.0])
-NA_CHECK_MODULE([ICE], [ice])
+FMA_CHECK_MODULE([GTK3], [gtk+-3.0], [${gtk_required}])
+FMA_CHECK_MODULE([GLIB], [glib-2.0], [${glib_required}])
+FMA_CHECK_MODULE([GMODULE], [gmodule-2.0],[${glib_required}])
+FMA_CHECK_MODULE([GIO_UNIX],[gio-unix-2.0])
+FMA_CHECK_MODULE([GTOP], [libgtop-2.0],[${gtop_required}])
+FMA_CHECK_MODULE([LIBXML], [libxml-2.0], [${xml_required}])
+FMA_CHECK_MODULE([UUID], [uuid])
+FMA_CHECK_MODULE([SM], [sm], [1.0])
+FMA_CHECK_MODULE([ICE], [ice])
# target a file manager (nautilus, nemo, ...)
NA_TARGET_FILE_MANAGER
diff --git a/m4/fma-check-module.m4 b/m4/fma-check-module.m4
index 0ce0218..e2b35dc 100644
--- a/m4/fma-check-module.m4
+++ b/m4/fma-check-module.m4
@@ -25,16 +25,16 @@
# Pierre Wieser <pwieser trychlos org>
# ... and many others (see AUTHORS)
-# serial 2 remove Gtk2 vs. Gtk3 check
+# serial 3 renamed as FMA_CHECK_MDOULE
-dnl usage: NA_CHECK_MODULE(var,module[,[version],[error]])
+dnl usage: FMA_CHECK_MODULE(var,module[,[version],[error]])
dnl
dnl if 'error' = 'no', then only displays on information message, making
dnl the lack of library non fatal.
dnl
# translit($1, 'a-z', 'A-Z'),
-AC_DEFUN([NA_CHECK_MODULE],[
+AC_DEFUN([FMA_CHECK_MODULE],[
_cond="$2"
if test "$3" != ""; then
_cond="$2 >= $3"
@@ -52,14 +52,14 @@ AC_DEFUN([NA_CHECK_MODULE],[
NAUTILUS_ACTIONS_CFLAGS="${NAUTILUS_ACTIONS_CFLAGS} ${$1_CFLAGS}"
NAUTILUS_ACTIONS_LIBS="${NAUTILUS_ACTIONS_LIBS} ${$1_LIBS}"
else
- _NA_CHECK_MODULE_MSG([$4],[$1: condition ${_cond} not satisfied])
+ _FMA_CHECK_MODULE_MSG([$4],[$1: condition ${_cond} not satisfied])
fi
])
dnl what to do when the searched for library is missing: it is a fatal
dnl error, or no ?
-AC_DEFUN([_NA_CHECK_MODULE_MSG],[
+AC_DEFUN([_FMA_CHECK_MODULE_MSG],[
if test "$1" = "no"; then
AC_MSG_RESULT([warning: $2])
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]