m4_define([ev_major_version],[2])
m4_define([ev_minor_version],[27])
-m4_define([ev_micro_version],[1])
+m4_define([ev_micro_version],[4])
m4_define([ev_extra_version],[])
m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
fi
AM_MAINTAINER_MODE([enable])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
AM_PROG_LIBTOOL
AC_ISC_POSIX
fi
AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
-AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"])
-AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
+AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
dnl Specify required versions of dependencies
DBUS_GLIB_REQUIRED=0.70
PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
SHELL_PLATFORM_PKGS=
case "$with_platform" in
;;
esac
-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
# *********
# SM client
if test "$with_gconf" = "yes"; then
PKG_CHECK_MODULES([GCONF],[gconf-2.0])
AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
-fi
-AM_GCONF_SOURCE_2
+ AM_GCONF_SOURCE_2
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
-if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then
- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+ AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
+ if test "$GCONFTOOL" = "false"; then
+ AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+else
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false)
fi
dnl Debug mode
# Check for Nautilus property page build
AC_ARG_ENABLE([nautilus],
- [AS_HELP_STRING([--enable-nautilus],[compile the nautilus plugin])],
+ [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])],
[],
[case "$with_platform" in
gnome) enable_nautilus=yes ;;
esac])
if test "$enable_nautilus" = "yes" ; then
- PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension])
+ PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension],
+ [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
AC_SUBST(NAUTILUS_CFLAGS)
# *****************************************************************************
-SHAVE_INIT([], [enable])
-
AC_CONFIG_FILES([
backend/Makefile
backend/comics/Makefile
po/Makefile.in
previewer/Makefile
properties/Makefile
-shave
-shave-libtool
shell/Makefile
test/Makefile
thumbnailer/Makefile