summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac56
1 files changed, 40 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index c2319b9d..70b61787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_PREREQ(2.54)
+AC_PREREQ(2.60)
dnl ===========================================================================
-m4_define(gdk-pixbuf_minver, 2.36.5)
+m4_define(gdkpixbuf_minver, 2.36.5)
m4_define(glib_minver, 2.58.1)
m4_define(gio_minver, 2.50.0)
m4_define(mate_desktop_minver, 1.17.3)
@@ -13,6 +13,7 @@ m4_define(exif_minver, 0.6.14)
m4_define(exempi_minver, 1.99.5)
m4_define(gail_minver, 3.0.0)
m4_define(notify_minver, 0.7.0)
+m4_define(gtk_layer_shell_minver, 0.8.0)
dnl 1. If the library code has changed at all since last release, then increment revision.
@@ -22,7 +23,7 @@ m4_define(caja_extension_current, 5)
m4_define(caja_extension_revision, 0)
AC_INIT([caja],
- [1.26.0],
+ [1.29.0],
[https://github.com/mate-desktop/caja/issues],
[caja],
[https://mate-desktop.org])
@@ -40,7 +41,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
-AC_SUBST(GDKPIXBUF_REQUIRED, [gdk-pixbuf_minver])
+AC_SUBST(GDKPIXBUF_REQUIRED, [gdkpixbuf_minver])
AC_SUBST(GLIB_REQUIRED, [glib_minver])
AC_SUBST(GIO_REQUIRED, [gio_minver])
AC_SUBST(MATE_DESKTOP_REQUIRED, [mate_desktop_minver])
@@ -60,8 +61,7 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
dnl Give error and exit if we dont have pkgconfig
if test "x$PKG_CONFIG" = "x"; then
@@ -72,7 +72,7 @@ AC_PATH_PROG([GLA11Y], [gla11y], [true])
AC_CHECK_LIB(m, floor)
PKG_CHECK_MODULES(ALL, [
- gdk-pixbuf-2.0 >= gdk-pixbuf_minver
+ gdk-pixbuf-2.0 >= gdkpixbuf_minver
glib-2.0 >= glib_minver
mate-desktop-2.0 >= mate_desktop_minver
gthread-2.0
@@ -134,7 +134,6 @@ fi
dnl ==========================================================================
-AC_CHECK_PROGS(PERL, perl5 perl)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
dnl ==========================================================================
@@ -164,7 +163,7 @@ dnl exempi checking
AM_CONDITIONAL(HAVE_EXEMPI, false)
AC_ARG_ENABLE(xmp,
- AC_HELP_STRING([--disable-xmp],
+ AS_HELP_STRING([--disable-xmp],
[build without xmp support]))
msg_xmp=no
if test "x$enable_xmp" != "xno"; then
@@ -178,7 +177,31 @@ if test "x$enable_xmp" != "xno"; then
AC_SUBST(EXEMPI_LIBS)
fi
-dnl ==========================================================================
+dnl **************************************************************************
+dnl Whether or not to build with wayland support and check for gtk-layer-shell
+dnl **************************************************************************
+
+
+AC_ARG_ENABLE(wayland,
+ [AS_HELP_STRING([--enable-wayland],
+ [Explicitly enable or disable Wayland support
+ (default is to enable only if Wayland client development library is detected)])],
+ [enable_wayland=$enableval],
+ [enable_wayland=auto])
+
+# Check if we have gtk-layer-shell installed, and thus should build with Wayland support
+have_wayland=no
+m4_define([WAYLAND_DEPS], [gtk-layer-shell-0 >= gtk_layer_shell_minver wayland-client])
+AS_IF([test "x$enable_wayland" = "xyes"],
+ [PKG_CHECK_MODULES([WAYLAND], [WAYLAND_DEPS], [have_wayland=yes])],
+ [test "x$enable_wayland" != "xno"],
+ [PKG_CHECK_MODULES([WAYLAND], [WAYLAND_DEPS], [have_wayland=yes], [have_wayland=no])])
+
+AM_CONDITIONAL(ENABLE_WAYLAND, [test "x$have_wayland" = "xyes"])
+
+if test "x$have_wayland" = "xyes"; then
+ AC_DEFINE(HAVE_WAYLAND, 1, [Have the Wayland development library])
+fi
dnl ****************************
dnl *** Check for libselinux ***
@@ -198,7 +221,7 @@ AC_SUBST(SELINUX_LIBS)
AC_ARG_ENABLE(empty_view,
- AC_HELP_STRING([--enable-empty-view], [Enable empty view]),
+ AS_HELP_STRING([--enable-empty-view], [Enable empty view]),
[ENABLE_EMPTY_VIEW=1
AC_DEFINE(ENABLE_EMPTY_VIEW, 1, [define to enable the empty view that is used for performance measurement])])
@@ -207,7 +230,7 @@ AM_CONDITIONAL(ENABLE_EMPTY_VIEW, test "x$ENABLE_EMPTY_VIEW" = "x1")
dnl ========== EEL/CAJA OMIT SELF CHECK ====================================
AC_ARG_ENABLE(self-check,
- AC_HELP_STRING([--disable-self-check], [build without self check]))
+ AS_HELP_STRING([--disable-self-check], [build without self check]))
msg_self_check=yes
if test "x$enable_self_check" = "xno"; then
msg_self_check=no
@@ -219,7 +242,7 @@ AM_CONDITIONAL(ENABLE_SELF_CHECK, test "x$msg_self_check" = "xyes")
dnl ==========================================================================
AC_ARG_ENABLE(packagekit,
- AC_HELP_STRING([--disable-packagekit],
+ AS_HELP_STRING([--disable-packagekit],
[build without PackageKit support]))
msg_packagekit=no
if test "x$enable_packagekit" != "xno"; then
@@ -241,7 +264,7 @@ AC_SUBST(LIBCAJA_EXTENSION_LIBS)
dnl core caja
PKG_CHECK_MODULES(GMODULE, gmodule-2.0, [GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
-CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail-3.0 libxml-2.0 $EXTRA_CORE_MODULES gtk+-3.0 x11"
+CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail-3.0 libxml-2.0 gtk+-3.0 x11"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES`"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES`"
@@ -269,12 +292,12 @@ dnl ==========================================================================
AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
AC_ARG_ENABLE(update-mimedb,
- AC_HELP_STRING([--disable-update-mimedb],
+ AS_HELP_STRING([--disable-update-mimedb],
[disable the update-mime-database after install [default=no]]),,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
+AC_ARG_ENABLE(icon-update, AS_HELP_STRING([--disable-icon-update],
[Disable icon cache update]))
if (test "$enable_icon_update" != no); then
AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache])
@@ -324,6 +347,7 @@ Configure summary:
PackageKit support: $msg_packagekit
Native Language support: $USE_NLS
Self check: $msg_self_check
+ Wayland support: ${have_wayland}
caja-extension documentation: ${enable_gtk_doc}
caja-extension introspection: ${found_introspection}
generated by cgit v1.2.1 (git 2.18.0) at 2025-12-16 10:21:24 +0000