summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac102
1 files changed, 20 insertions, 82 deletions
diff --git a/configure.ac b/configure.ac
index 5834c6bc..3e2bc84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,15 +2,14 @@ AC_PREREQ(2.54)
dnl ===========================================================================
-m4_define(glib_minver, 2.28.0)
+m4_define(glib_minver, 2.36.0)
m4_define(gio_minver, 2.26.0)
m4_define(mate_desktop_minver, 1.9.0)
m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.24.0)
m4_define(xml_minver, 2.4.7)
-m4_define(exif_minver, 0.5.12)
-m4_define(exempi_minver, 1.99.2)
-m4_define(exempi_minver_newapi, 1.99.5)
+m4_define(exif_minver, 0.6.14)
+m4_define(exempi_minver, 1.99.5)
m4_define(gail_minver, 0.16)
@@ -20,7 +19,7 @@ dnl Interface break is not allowed.
m4_define(caja_extension_current, 5)
m4_define(caja_extension_revision, 0)
-AC_INIT([caja], [1.9.2], [http://www.mate-desktop.org])
+AC_INIT([caja], [1.10.0], [http://www.mate-desktop.org])
dnl ---------------------------------------------------------------------------
dnl GTK library version
@@ -132,7 +131,6 @@ AC_DEFINE([HAVE_GTK_MULTIHEAD], [], [needed for egg-screen-exec functions])
AH_TEMPLATE([HAVE_STARTUP_NOTIFICATION])
AH_TEMPLATE([HAVE_EXIF])
-AH_TEMPLATE([HAVE_OLD_EXIF])
AH_TEMPLATE([HAVE_RENDER])
AM_GLIB_GNU_GETTEXT
@@ -154,56 +152,17 @@ dnl ==========================================================================
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/param.h malloc.h)
AC_CHECK_FUNCS(mallopt)
-dnl X
-
-x_libs="`$PKG_CONFIG --libs pangox`"
-case x_libs in
- *-lX11*) pango_omitted_x_deps=no ;;
- *) pango_omitted_x_deps=yes ;;
-esac
-
-x_cflags="`$PKG_CONFIG --cflags pangox`"
-x_extra_libs=
-
-if test $pango_omitted_x_deps = yes ; then
- AC_PATH_XTRA
-
- if test x$no_x = xyes ; then
- AC_MSG_ERROR([X development libraries not found])
- fi
-
- x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-fi
-
-## Strip the .la files
-
-x_libs_for_checks=$x_libs
-#for I in $x_libs ; do
-# case $I in
-# *.la) ;;
-# *) x_libs_for_checks="$x_libs_for_checks $I" ;;
-# esac
-#done
-
-AC_CHECK_LIB(X11, XOpenDisplay, :,
- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
- $x_libs_for_checks)
-
dnl ==========================================================================
AM_CONDITIONAL(HAVE_EXIF, false)
dnl libexif checking
-PKG_CHECK_MODULES(EXIF, libexif > exif_minver,
+PKG_CHECK_MODULES(EXIF, libexif >= exif_minver,
[AM_CONDITIONAL(HAVE_EXIF, true)
AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support])
],
- [PKG_CHECK_MODULES(EXIF, libexif = exif_minver,
- [AM_CONDITIONAL(HAVE_EXIF, true)
- AC_DEFINE(HAVE_OLD_EXIF, 1, [Define if your EXIF library has old API])
- ], [AM_CONDITIONAL(HAVE_EXIF, false)])
- ])
+ [AM_CONDITIONAL(HAVE_EXIF, false)])
AC_SUBST(EXIF_CFLAGS)
AC_SUBST(EXIF_LIBS)
@@ -225,10 +184,6 @@ if test "x$enable_xmp" != "xno"; then
msg_xmp=yes,
[AM_CONDITIONAL(HAVE_EXEMPI, false)])
- PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
- AC_DEFINE(HAVE_EXEMPI_NEW_API, 1,
- [Define if we have exempi with the new API]), true)
-
AC_SUBST(EXEMPI_CFLAGS)
AC_SUBST(EXEMPI_LIBS)
fi
@@ -275,26 +230,17 @@ fi
#============================================================================
# libunique
#============================================================================
-PKG_CHECK_MODULES(UNIQUE, unique-$LIBUNIQUE_VERSION, enable_libunique=yes, enable_libunique=no)
+PKG_CHECK_MODULES(UNIQUE, unique-$LIBUNIQUE_VERSION)
AC_SUBST([UNIQUE_CFLAGS])
AC_SUBST([UNIQUE_LIBS])
-#AC_ARG_ENABLE(unique, [ --enable-unique enable the use of libunique instead of g_application or gtk_application], enable_libunique=yes,)
-
-if test "x$enable_libunique" = "xyes"; then
- UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DUSE_UNIQUE=1"
- # fix for deprecated on 2.26
- # unique, on 1.0 version, has deprecated symbols in glib 2.26, but
- # we avoid problems using -DG_CONST_RETURN=const
- if $PKG_CONFIG --atleast-version 2.26 glib-2.0; then
- UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DG_CONST_RETURN=const"
- fi
+# this deprecated stuff should be removed from unique in most distros
+# but it's still not removed upstream in unique 1.x, so leaving it alone
+# just in case.
+UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DG_CONST_RETURN=const"
- EXTRA_CORE_MODULES="$EXTRA_CORE_MODULES unique-$LIBUNIQUE_VERSION"
-else
- AC_ERROR([LIBUNIQUE ${LIBUNIQUE_VERSION} not found])
-fi
+EXTRA_CORE_MODULES="$EXTRA_CORE_MODULES unique-$LIBUNIQUE_VERSION"
# ==========================================================================
@@ -368,21 +314,14 @@ dnl ===========================================================================
#
# Checks for Xft/XRender
#
-have_render=false
-RENDER_LIBS=""
-AC_CHECK_LIB(Xrender, XRenderFindFormat,
- have_render=true,:,-lXext)
-
-if $have_render ; then
- RENDER_LIBS="-lXrender -lXext"
- AC_DEFINE(HAVE_RENDER)
+PKG_CHECK_MODULES([RENDER], [xrender xext], [have_render=yes], [have_render=no])
+if test x$have_render = xyes; then
+ AC_DEFINE(HAVE_RENDER)
+ AC_SUBST(RENDER_CFLAGS)
+ AC_SUBST(RENDER_LIBS)
fi
-AC_SUBST(RENDER_LIBS)
-
-
-
dnl ==========================================================================
dnl libegg
@@ -401,10 +340,10 @@ 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$GAIL_API_VERSION libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION"
-CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+CORE_MODULES="glib-2.0 $GMODULE_ADD mate-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail$GAIL_API_VERSION libxml-2.0 $EXTRA_CORE_MODULES gtk+-$GTK_API_VERSION x11"
+CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES`"
AC_SUBST(CORE_CFLAGS)
-CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES`"
AC_SUBST(CORE_LIBS)
DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
@@ -482,7 +421,6 @@ caja-$VERSION:
source code location: ${srcdir}
compiler: ${CC}
xmp support: $msg_xmp
- Use libunique: ${enable_libunique}
Gtk+ version: ${GTK_API_VERSION}
PackageKit support: $msg_packagekit
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-24 23:43:48 +0000