X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=configure.ac;h=3e477e59e2ce37df9f194695be866626e358198f;hb=c24535f0f7164b69d309eb62c36b020568c7e4bd;hp=25aaa7f4888120fc7a1182555b3323379fb164a5;hpb=aaf935747f65a1084ba4ffa3cf32a1e1ea93c987;p=evince.git diff --git a/configure.ac b/configure.ac index 25aaa7f4..3e477e59 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([ev_major_version],[2]) m4_define([ev_minor_version],[27]) -m4_define([ev_micro_version],[1]) +m4_define([ev_micro_version],[90]) m4_define([ev_extra_version],[]) m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) @@ -51,6 +51,8 @@ if test -z "$enable_maintainer_mode"; then fi AM_MAINTAINER_MODE([enable]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AM_PROG_LIBTOOL AC_ISC_POSIX @@ -59,7 +61,8 @@ AM_PROG_CC_STDC AM_PROG_CC_C_O AC_PROG_CXX AC_STDC_HEADERS -IT_PROG_INTLTOOL([0.35.0]) + +AC_PROG_SED AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) @@ -71,11 +74,17 @@ GNOME_CXX_WARNINGS GTK_DOC_CHECK(1.0) +IT_PROG_INTLTOOL([0.35.0]) + GETTEXT_PACKAGE=evince AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AM_GLIB_GNU_GETTEXT +m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below +EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend: %.evince-backend.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE]) + # Check which platform to use AC_MSG_CHECKING([for which platform to build]) @@ -106,12 +115,12 @@ if test "$with_platform" = "win32"; then AC_MSG_RESULT([$os_win32]) fi -AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"]) -AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) +AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"]) +AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"]) dnl Specify required versions of dependencies DBUS_GLIB_REQUIRED=0.70 -GTK_REQUIRED=2.12.0 +GTK_REQUIRED=2.14.0 GLIB_REQUIRED=2.18.0 KEYRING_REQUIRED=2.22.0 AC_SUBST([GLIB_REQUIRED]) @@ -133,8 +142,18 @@ PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIR 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(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) +PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) + +SHELL_PLATFORM_PKGS= +case "$with_platform" in + hildon) AC_DEFINE([PLATFORM_HILDON],[1],[Define if building for the hildon platform]) + SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso" + ;; + *) SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" + ;; +esac + +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 @@ -175,14 +194,11 @@ AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"]) BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols" AC_SUBST(BACKEND_LIBTOOL_FLAGS) -if test "$with_platform" = "gnome"; then - PKG_CHECK_EXISTS([gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED]) -fi - dnl ===== Check special functions evince_save_LIBS=$LIBS LIBS="$LIBS $BACKEND_LIBS" AC_CHECK_FUNCS(cairo_format_stride_for_width) +AC_CHECK_FUNCS(gtk_print_operation_get_n_pages_to_print) LIBS=$evince_save_LIBS # ****************** @@ -225,34 +241,38 @@ fi GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -dnl ========= Check for DBUS -AC_ARG_ENABLE(dbus, - [AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])], - enable_dbus="$enableval",enable_dbus=yes) -if test "x$enable_dbus" != "xno"; then - PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], - [enable_dbus=yes],[enable_dbus=no]) +# **** +# DBUS +# **** - if test "x$enable_dbus" = "xno"; then - AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found]) - fi +AC_ARG_ENABLE([dbus], + [AS_HELP_STRING([--enable-dbus], [Compile with support for dbus])], + [], + [case "$with_platform" in + gnome) enable_dbus=yes ;; + hildon) enable_dbus=no ;; + esac]) - if test "x$enable_dbus" = "xyes" ; then - AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) +if test "$enable_dbus" = "yes"; then + PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED],[], + [AC_MSG_ERROR([DBUS not found; use --disable-dbus to disable DBUS support])]) - if test x$DBUS_BINDING_TOOL = "xno" ; then - AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings]) - fi + AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) + if test x$DBUS_BINDING_TOOL = "xno" ; then + AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings]) + fi - AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) - fi + AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) fi AC_SUBST([DBUS_CFLAGS]) AC_SUBST([DBUS_LIBS]) -AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"]) -AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"]) +AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"]) + +if test "$enable_dbus" = "yes"; then + PKG_CHECK_MODULES([EV_DAEMON], [gthread-2.0 gio-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) +fi dnl ========= Check for GConf @@ -271,13 +291,15 @@ AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"]) 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 @@ -291,6 +313,12 @@ if test "x$enable_debug" = "xyes"; then DEBUG_FLAGS="-DEV_ENABLE_DEBUG" fi +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--enable-tests], [Disable tests]), + enable_tests="$enableval", + enable_tests=yes) + +AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS" LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS" @@ -316,9 +344,13 @@ FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz" AC_SUBST(FRONTEND_CFLAGS) AC_SUBST(FRONTEND_LIBS) +EV_DAEMON_CFLAGS="$EV_DAEMON_CFLAGS $DEBUG_FLAGS" +AC_SUBST([EV_DAEMON_CFLAGS]) +AC_SUBST([EV_DAEMON_LIBS]) + # 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 ;; @@ -326,7 +358,8 @@ AC_ARG_ENABLE([nautilus], 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) @@ -651,8 +684,6 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age]) # ***************************************************************************** -SHAVE_INIT([], [enable]) - AC_CONFIG_FILES([ backend/Makefile backend/comics/Makefile @@ -665,7 +696,7 @@ backend/pixbuf/Makefile backend/ps/Makefile backend/tiff/Makefile cut-n-paste/Makefile -cut-n-paste/gedit-message-area/Makefile +cut-n-paste/evinfobar/Makefile cut-n-paste/gimpcellrenderertoggle/Makefile cut-n-paste/smclient/Makefile cut-n-paste/toolbar-editor/Makefile @@ -706,8 +737,6 @@ Makefile po/Makefile.in previewer/Makefile properties/Makefile -shave -shave-libtool shell/Makefile test/Makefile thumbnailer/Makefile @@ -720,6 +749,7 @@ AC_OUTPUT echo " Configure summary: + Platform...........: $with_platform GConf Support......: $with_gconf GTK+ Unix Print....: $with_gtk_unix_print Keyring Support....: $with_keyring @@ -731,6 +761,7 @@ Configure summary: Gtk-Doc Support....: $enable_gtk_doc Debug mode.........: $enable_debug GObj. Introspection: $enable_introspection + Tests..............: $enable_tests PDF Backend........: $enable_pdf PostScript Backend.: $enable_ps