diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index b05c0ec..62dc453 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ(2.59) AC_CONFIG_MACRO_DIR([m4]) m4_define(eom_major_version, 1) -m4_define(eom_minor_version, 24) +m4_define(eom_minor_version, 28) m4_define(eom_micro_version, 0) m4_define(eom_version, eom_major_version.eom_minor_version.eom_micro_version) -AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [eom]) +AC_INIT([eom], eom_version, https://github.com/mate-desktop/eom/issues, [eom], [https://mate-desktop.org]) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) # Support silencing the build output if supported (automake-1.11+) @@ -45,6 +45,10 @@ GTK_DOC_CHECK(1.9) AC_CHECK_FUNCS(strptime) +GETTEXT_PACKAGE=AC_PACKAGE_NAME +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.]) + # **************************************************************** # Support for nl_langinfo (_NL_MEASUREMENT_MEASUREMENT) (optional) # **************************************************************** @@ -62,13 +66,9 @@ fi # *********** # Translation # *********** -AM_GNU_GETTEXT_VERSION([0.19.8]) -AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) AM_GNU_GETTEXT([external]) - -GETTEXT_PACKAGE=AC_PACKAGE_NAME -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_CONDITIONAL([USE_NLS], [test "x${USE_NLS}" = "xyes"]) AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) @@ -143,7 +143,7 @@ fi LIBEXIF_REQUIRED=0.6.14 -AC_ARG_WITH([libexif], AC_HELP_STRING([--without-libexif], [disable EXIF support])) +AC_ARG_WITH([libexif], AS_HELP_STRING([--without-libexif], [disable EXIF support])) have_exif=no if test x$with_libexif != xno; then PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_REQUIRED, have_exif=yes, have_exif=no) @@ -159,7 +159,7 @@ AM_CONDITIONAL([HAVE_EXIF], [test "x$have_exif" = "xyes"]) # Little CMS (optional) # ********************* -AC_ARG_WITH([cms], AC_HELP_STRING([--without-cms], [disable colour management support])) +AC_ARG_WITH([cms], AS_HELP_STRING([--without-cms], [disable colour management support])) have_lcms=no if test x$with_cms != xno; then PKG_CHECK_MODULES(LCMS, lcms2, have_lcms=yes, have_lcms=no) @@ -174,7 +174,7 @@ AM_CONDITIONAL([HAVE_LCMS], [test "x$have_lcms" = "xyes"]) # ********************* # Exempi (optional) # ********************* -AC_ARG_WITH(xmp, AC_HELP_STRING([--without-xmp], [disable special XMP support])) +AC_ARG_WITH(xmp, AS_HELP_STRING([--without-xmp], [disable special XMP support])) have_exempi=no if test x$with_xmp != xno; then PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= $EXEMPI_REQUIRED, have_exempi=yes, have_exempi=no) @@ -202,7 +202,7 @@ AC_SUBST([EOM_DOC_EXIF_STOP]) # Jpeg (semi-optional) # ******************** -AC_ARG_WITH(libjpeg, AC_HELP_STRING([--without-libjpeg], [disable special JPEG support])) +AC_ARG_WITH(libjpeg, AS_HELP_STRING([--without-libjpeg], [disable special JPEG support])) have_jpeg=no have_libjpeg_80=no if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then @@ -272,7 +272,7 @@ PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_REQUIRED]) LIBRSVG_REQUIRED=2.36.2 -AC_ARG_WITH([librsvg], AC_HELP_STRING([--without-librsvg], [disable RSVG support])) +AC_ARG_WITH([librsvg], AS_HELP_STRING([--without-librsvg], [disable RSVG support])) have_rsvg=no if test x$with_librsvg != xno; then PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= $LIBRSVG_REQUIRED, have_rsvg=yes, have_rsvg=no) @@ -318,17 +318,17 @@ if test "x$enable_thumbnailer" != "xno"; then CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" - AC_CHECK_HEADER([wand/MagickWand.h], - [have_im6="yes"], - [AC_CHECK_HEADER([MagickWand/MagickWand.h], [have_im7="yes"])]) + AC_CHECK_HEADER([MagickWand/MagickWand.h], + [have_im7="yes"], + [AC_CHECK_HEADER([wand/MagickWand.h], [have_im6="yes"])]) CPPFLAGS="$CPPFLAGS_save" - if test "x$have_im6" = "xyes"; then - AC_DEFINE(HAVE_IMAGEMAGICK6,1, [Have ImageMagick 6]) - fi if test "x$have_im7" = "xyes"; then AC_DEFINE(HAVE_IMAGEMAGICK7,1, [Have ImageMagick 7]) fi + if test "x$have_im6" = "xyes"; then + AC_DEFINE(HAVE_IMAGEMAGICK6,1, [Have ImageMagick 6]) + fi THUMBNAILER_CFLAGS="$CFLAGS $GLIB_CFLAGS $GIO_CFLAGS $MAGICK_CFLAGS" AC_SUBST(THUMBNAILER_CFLAGS) @@ -394,6 +394,7 @@ help/Makefile po/Makefile.in data/Makefile data/eom.pc +data/eom.appdata.xml.in data/eom.desktop.in data/org.mate.eom.gschema.xml data/pixmaps/Makefile @@ -403,6 +404,9 @@ doc/reference/Makefile doc/reference/version.xml doc/reference/eom-docs.sgml plugins/Makefile +plugins/fullscreen/fullscreen.plugin.desktop.in +plugins/reload/reload.plugin.desktop.in +plugins/statusbar-date/statusbar-date.plugin.desktop.in thumbnailer/Makefile thumbnailer/eom-thumbnailer.thumbnailer ]) @@ -412,6 +416,9 @@ AC_OUTPUT echo " Configure summary: + ${PACKAGE_STRING} + `echo $PACKAGE_STRING | sed "s/./=/g"` + Source code location .......: ${srcdir} Compiler ...................: ${CC} Extra Compiler Warnings ....: ${WARN_CFLAGS} @@ -422,5 +429,6 @@ Configure summary: RSVG support ...............: ${have_rsvg} Colour management support ..: ${have_lcms} GObject Introspection.......: ${have_introspection} + Native Language support.....: ${USE_NLS} Thumbnailer.................: ${eom_thumbnailer} " |