X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=configure.in;h=59f88a121c2469506fa208c60c355dafd6bafcda;hp=d3f0fbe82fe1a6b78505ec9b024c1aeb4fd74d6e;hb=686b5bed543c5abd0310eff74d3d8083ab1ff01c;hpb=11a4cc2074aa9544a906434f40eda2b27d6ef5c1 diff --git a/configure.in b/configure.in index d3f0fbe8..59f88a12 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*- Autoconf -*- dnl This file is a part of Geeqie project (http://geeqie.sourceforge.net/). -dnl Copyright (C) 2008 - 2009 The Geeqie Team +dnl Copyright (C) 2008 - 2012 The Geeqie Team dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. AC_PREREQ(2.57) -AC_INIT(geeqie, 1.0alpha3, geeqie-devel@lists.sourceforge.net) +AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net) # Check for rightly dirs AC_CONFIG_SRCDIR([src/main.c]) @@ -43,6 +43,17 @@ else fi ]) +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(OFF) +DX_PS_FEATURE(OFF) + +DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen.conf, doc/doxygen) + # Debug support # ---------------------------------------------------------------------- @@ -68,12 +79,12 @@ AC_HELP_STRING([--enable-debug-log], [enable debugging messages [default=yes]])] if test "x${enable_debug_flags}" != "xno" then - if test "x${enable_developer}" == "xyes" + if test "x${enable_developer}" = "xyes" then CXXFLAGS="${CXXFLAGS} -Wall" CFLAGS="${CFLAGS} -Wstrict-prototypes -Wall" fi - __COMMONFLAGS="-g -O0 -Wextra -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wno-unused-parameter -Wformat -Wformat-security" + __COMMONFLAGS="-g -O0 -Wextra -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wno-unused-parameter -Wformat -Wformat-security -DGQ_DEBUG_PATH_UTF8=1" CXXFLAGS="${CXXFLAGS} ${__COMMONFLAGS}" CFLAGS="${CFLAGS} ${__COMMONFLAGS} -Wimplicit-int -Werror-implicit-function-declaration" __IS_DEBUG_FLAGS=yes @@ -92,7 +103,7 @@ fi AM_CONDITIONAL(DEBUG, test x$enable_debug_flags = xyes) AC_ARG_ENABLE(deprecated, [ -AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [], +AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [], [ if test "x${enable_developer}" != "xyes" then @@ -117,6 +128,9 @@ AC_PROG_CC AC_PROG_CXX AC_STDC_HEADERS AC_ARG_PROGRAM +AC_SYS_LARGEFILE +IT_PROG_INTLTOOL([0.35.0]) + dnl checks for functions AC_CHECK_FUNCS(strverscmp access fsync fflush) @@ -175,8 +189,23 @@ else prefix=$prefix fi -AM_PATH_GLIB_2_0(2.4.0,,AC_MSG_ERROR(GLIB >= 2.4.0 not installed.)) -AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(GTK+ >= 2.4.0 not installed.)) +AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.)) +AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])]) + +if test x$gtk3 == xyes; then + AC_MSG_WARN("Gtk3 enabled") + m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))]) +else + if test x$gtk3 != xno; then + AC_MSG_WARN("Gtk3 is preferred...") + m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,[gtk3=no])]) + fi +fi + +if test x$gtk3 == xno; then + m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))]) + true +fi threads="auto" AC_ARG_ENABLE([threads], @@ -205,11 +234,18 @@ AC_ARG_WITH(htmldir, [ --with-htmldir=DIR install path for html files], AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files]) AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation]) +AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool) + AC_SUBST(readmedir) AC_SUBST(htmldir) eval "eval appdir=${datadir}/${PACKAGE}" AC_DEFINE_UNQUOTED([GQ_APP_DIR], "$appdir", [Location of application data]) +AC_SUBST(appdir) + +eval "eval gq_bindir=${prefix}/lib/${PACKAGE}" +AC_DEFINE_UNQUOTED([GQ_BIN_DIR], "$gq_bindir", [Location of helper scripts and executables]) +AC_SUBST(gq_bindir) # LIRC support # ---------------------------------------------------------------------- @@ -254,23 +290,74 @@ AC_ARG_ENABLE([lcms], [liblcms=$enableval], [liblcms=auto]) if test "x${liblcms}" != "xno"; then - PKG_CHECK_MODULES(LCMS, [lcms >= 1.14], + PKG_CHECK_MODULES(LCMS, [lcms2 >= 2.0], [ HAVE_LCMS=yes AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles with lcms]) + AC_DEFINE(HAVE_LCMS2, 1, [lcms2 is used]) ], [ - HAVE_LCMS=no - AC_MSG_WARN([$LCMS_PKG_ERRORS]) + PKG_CHECK_MODULES(LCMS, [lcms >= 1.14], + [ + HAVE_LCMS=yes + AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles with lcms]) + ], + [ + HAVE_LCMS=no + AC_MSG_WARN([$LCMS_PKG_ERRORS]) + ]) ]) else HAVE_LCMS=disabled fi - + AM_CONDITIONAL(HAVE_LCMS, [test "x$HAVE_LCMS" = xyes]) AC_SUBST(LCMS_CFLAGS) AC_SUBST(LCMS_LIBS) +# libjpeg support +# ---------------------------------------------------------------------- + +AC_ARG_ENABLE([jpeg], + AC_HELP_STRING([--disable-jpeg], [disable direct jpeg support]), + [libjpeg=$enableval], [libjpeg=auto]) + +if test "x${libjpeg}" != "xno"; then + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + HAVE_JPEG=yes + JPEG_LIBS=-ljpeg + AC_DEFINE(HAVE_JPEG, 1, [define to enable use of custom jpeg loader]), + HAVE_JPEG=no) +else + HAVE_JPEG=disabled +fi + +AM_CONDITIONAL(HAVE_JPEG, [test "x$HAVE_JPEG" = xyes]) +AC_SUBST(JPEG_CFLAGS) +AC_SUBST(JPEG_LIBS) + + +# libtiff support +# ---------------------------------------------------------------------- + +AC_ARG_ENABLE([tiff], + AC_HELP_STRING([--disable-tiff], [disable direct tiff support]), + [libtiff=$enableval], [libtiff=auto]) + +if test "x${libtiff}" != "xno"; then + AC_CHECK_LIB(tiff, TIFFClientOpen, + HAVE_TIFF=yes + TIFF_LIBS=-ltiff + AC_DEFINE(HAVE_TIFF, 1, [define to enable use of custom tiff loader]), + HAVE_TIFF=no) +else + HAVE_TIFF=disabled +fi + +AM_CONDITIONAL(HAVE_TIFF, [test "x$HAVE_TIFF" = xyes]) +AC_SUBST(TIFF_CFLAGS) +AC_SUBST(TIFF_LIBS) + # Exiv2 support # ---------------------------------------------------------------------- @@ -292,7 +379,7 @@ if test "x${libexiv2}" != "xno"; then else HAVE_EXIV2=disabled fi - + AM_CONDITIONAL(HAVE_EXIV2, [test "x$HAVE_EXIV2" = xyes]) AC_SUBST(EXIV2_CFLAGS) AC_SUBST(EXIV2_LIBS) @@ -317,27 +404,101 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) +# clutter support - experimental +# ---------------------------------------------------------------------- + +AC_ARG_ENABLE([clutter], + AC_HELP_STRING([--enable-clutter], [enable clutter support - experimental]), + [libclutter=$enableval], [libclutter=auto]) + +if test "x${libclutter}" = "xyes" -o "x${libgps}" = "xyes"; then + PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0], + [ + PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0], + [ + HAVE_CLUTTER=yes + AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library]) + ], + [ + HAVE_CLUTTER=no + AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS]) + ]) + + ], + [ + HAVE_CLUTTER=no + AC_MSG_WARN([$CLUTTER_PKG_ERRORS]) + ]) +else + HAVE_CLUTTER=disabled +fi + +AC_SUBST(CLUTTER_CFLAGS) +AC_SUBST(CLUTTER_LIBS) +AC_SUBST(CLUTTER_GTK_CFLAGS) +AC_SUBST(CLUTTER_GTK_LIBS) + + +# Libchamplain support - used for GPS map facility - experimental +# ---------------------------------------------------------------------- + +AC_ARG_ENABLE([gps], + AC_HELP_STRING([--enable-gps], [enable GPS map support - experimental]), + [libgps=$enableval], [libgps=yes]) + +if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes" ; then + PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], + [ + HAVE_LIBCHAMPLAIN=yes + AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of GPS maps]) + ], + [ + HAVE_LIBCHAMPLAIN=no + AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS]) + ]) +else + HAVE_LIBCHAMPLAIN=disabled +fi + +if test "x${libgps}" = "xyes" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then + PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12], + [ + HAVE_LIBCHAMPLAIN_GTK=yes + AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of GPS maps]) + ], + [ + HAVE_LIBCHAMPLAIN_GTK=no + AC_MSG_WARN([$LIBCHAMPLAIN_GTK_PKG_ERRORS]) + ]) +else + HAVE_LIBCHAMPLAIN_GTK=disabled +fi + +AM_CONDITIONAL(HAVE_LIBCHAMPLAIN_GTK, [test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes]) +AC_SUBST(LIBCHAMPLAIN_GTK_CFLAGS) +AC_SUBST(LIBCHAMPLAIN_GTK_LIBS) + AH_TOP([ -/** @file config.h - * autogenerated definition by autoheader. - * @author Bruclik +/** \file + * \short autogenerated definition by autoheader. + * \author Bruclik */ - + /* * This file is a part of Geeqie project (http://geeqie.sourceforge.net/). - * Copyright (C) 2008 - 2009 The Geeqie Team - * + * Copyright (C) 2008 - 2012 The Geeqie Team + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - */ - + */ + #ifndef _INCLUDE_CONFIG_H #define _INCLUDE_CONFIG_H ]) @@ -356,6 +517,9 @@ AC_CONFIG_FILES([ doc/Makefile plugins/Makefile plugins/symlink/Makefile + plugins/rotate/Makefile + plugins/ufraw/Makefile + plugins/import/Makefile geeqie.spec ]) @@ -387,7 +551,7 @@ Flags: Gtk: $GTK_CFLAGS Glib: $GLIB_CFLAGS Thread: $GTHREAD_LIBS - Others: $LCMS_LIBS $EXIV2_LIBS + Others: $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $CLUTTER_LIBS $CLUTTER_GTK_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS Localization: NLS support: $USE_NLS @@ -403,10 +567,15 @@ Support: LCMS: $HAVE_LCMS Exiv2: $HAVE_EXIV2 Lirc: $HAVE_LIRC + Clutter: $HAVE_CLUTTER + Libchamplain: $HAVE_LIBCHAMPLAIN + Libchamplain-gtk: $HAVE_LIBCHAMPLAIN_GTK Documentation: Doxygen: $DOXYGEN Formats: $doxy_formats_report + doc-tool: $GNOME_DOC_TOOL + END cat config.report