X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=a0459df966007391e8e8ea8e090a921b41b36361;hb=848665b157185945d190a7a746d054d7f5d5e6e0;hp=106a8d1f8276f7b554f45e8ebeef793632625974;hpb=d2222e0879e7bd247bec339105bc2c057907b9b5;p=evince.git diff --git a/configure.ac b/configure.ac index 106a8d1f..a0459df9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,9 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(evince, 0.3.1) +AC_INIT(evince, 0.3.2) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work -AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS") - AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -19,10 +16,16 @@ AM_PROG_CC_STDC AC_PROG_CXX AC_STDC_HEADERS AC_PROG_INTLTOOL +AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) +AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) +GNOME_COMMON_INIT +GNOME_MAINTAINER_MODE_DEFINES +GNOME_COMPILE_WARNINGS +GNOME_CXX_WARNINGS GNOME_DEBUG_CHECK -ALL_LINGUAS="bg ca cs da de el en_CA en_GB es fi fr hu ja ko lt nb nl no pt_BR ru rw sv uk wa zh_CN zh_TW" +ALL_LINGUAS="bg ca cs da de el en_CA en_GB es eu fi fr hu ja ko lt nb nl no pt_BR ru rw sk sv th uk wa zh_CN zh_TW" AM_GLIB_GNU_GETTEXT @@ -30,50 +33,95 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -POPPLER_REQUIRED=0.3.2 +dnl Check dependencies + +# LIB_CFLAGS for helpers and generic widgets. (lib, cut-and-paste) +# BACKEND_CFLAGS for backend implementations. +# FRONTEND_CFLAGS for frontend implementations. (properties, thumbnailer) +# FRONTEND_LIBS +# SHELL_CFLAGS for shell implementation. +# SHELL_LIBS + +POPPLER_REQUIRED=0.3.3 +DBUS_GLIB_REQUIRED=0.33 +GTK_REQUIRED=2.6.0 +LIBGNOMEUI_REQUIRED=2.6.0 -PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0) -PKG_CHECK_MODULES(TOOLBAR_EDITOR, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) -PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) -PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= 2.4.0) -PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) -PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 poppler-glib >= $POPPLER_REQUIRED) -PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0) -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0) -PKG_CHECK_MODULES(PS, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeui-2.0) -PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED) +PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED) +PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED) +PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 poppler-glib >= $POPPLER_REQUIRED) +PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED) +PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 libgnomeprint-2.2 >= 2.5.1 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -dnl Compile with disable-deprecated switches +PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], + [enable_dbus=yes],[enable_dbus=no]) +AC_SUBST([DBUS_CFLAGS]) +AC_SUBST([DBUS_LIBS]) -AC_ARG_ENABLE(deprecated, -AC_HELP_STRING([--disable-deprecated], - [Don't allow any deprecated GTK+/etc. features.]), -set_enable_deprecated="$enableval",[ -if test -f $srcdir/autogen.sh; then - is_cvs_version=true - set_enable_deprecated=no -else - set_enable_deprecated=yes - fi -]) -AC_MSG_CHECKING([whether to disable deprecated glib/gtk+/etc. features]) -if test "$set_enable_deprecated" != "yes"; then - AC_MSG_RESULT(yes) - EVINCE_DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED" -else - AC_MSG_RESULT(no) - EVINCE_DISABLE_DEPRECATED="" +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 + +if test "x$enable_dbus" = "xyes" ; then + 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]) + AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled]) + + DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'` + AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.]) fi -AC_SUBST(EVINCE_DISABLE_DEPRECATED) +SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS" +SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -ltiff -lz" +AC_SUBST(SHELL_CFLAGS) +AC_SUBST(SHELL_LIBS) + +FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS" +FRONTEND_LIBS="$FRONTEND_CORE_LIBS -ltiff -lz" +AC_SUBST(FRONTEND_CFLAGS) +AC_SUBST(FRONTEND_LIBS) + +AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"]) +AM_CONDITIONAL([ENABLE_METADATA], [test "x$enable_dbus" = "xyes"]) +AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"]) + +dnl Check for Nautilus property page build +AC_ARG_ENABLE(nautilus, + AC_HELP_STRING([--enable-nautilus],[compile the nautilus plugin]), + [case "${enableval}" in + yes) ENABLE_NAUTILUS=yes ;; + no) ENABLE_NAUTILUS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-nautilus) ;; + esac], + [ENABLE_NAUTILUS=yes]) dnl Default value + +if test x$ENABLE_NAUTILUS = "xyes" ; then + PKG_CHECK_MODULES(NAUTILUS, gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension, + [HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no]) +fi + +AC_SUBST(NAUTILUS_CFLAGS) +AC_SUBST(NAUTILUS_LIBS) +if test x$HAVE_NAUTILUS = "xyes"; then + AC_DEFINE(HAVE_NAUTILUS, 1, [defined if you build the nautilus plugin]) +fi +AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes") + +dnl Check for gtk_icon_view_get_visible_range evince_save_LIBS=$LIBS LIBS="$LIBS $GTK_LIBS" AC_CHECK_FUNCS(gtk_icon_view_get_visible_range) LIBS=$evince_save_LIBS +dnl GConf configuration AM_GCONF_SOURCE_2 AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no]) @@ -217,58 +265,6 @@ if test "x$enable_tiff" = "xyes"; then fi AC_SUBST(EVINCE_MIME_TYPES) -dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. -dnl stolen from nautilus and gnome-common - -AC_ARG_ENABLE(more-warnings, -[ --enable-more-warnings Maximum compiler warnings], -set_more_warnings="$enableval",[ -if test -f $srcdir/autogen.sh; then - is_cvs_version=true - set_more_warnings=yes -else - set_more_warnings=no -fi -]) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT([yes, using gcc]) - CFLAGS="\ - -Wall \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith \ - -Wcast-align -Wsign-compare \ - -Werror \ - $CFLAGS" - -dnl case " $CFLAGS " in -dnl *[\ \ ]-ansi[\ \ ]*) ;; -dnl *) CFLAGS="$CFLAGS -ansi" ;; -dnl esac -dnl case " $CFLAGS " in -dnl *[\ \ ]-pedantic[\ \ ]*) ;; -dnl *) CFLAGS="$CFLAGS -pedantic" ;; -dnl esac - - for option in -Wno-strict-aliasing -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi - AC_OUTPUT([ Makefile cut-n-paste/Makefile @@ -287,6 +283,7 @@ dvi/Makefile dvi/mdvi-lib/Makefile po/Makefile.in backend/Makefile +properties/Makefile shell/Makefile thumbnailer/Makefile help/Makefile