# HG changeset patch # User Matti Hamalainen # Date 1515947047 -7200 # Node ID 66ce340f0cd9e03f0f60048a3500dc02d8350992 # Parent c8b8f40f0dd06584468eed601811a37fe2e60fc7 Merge and resolve configure changes. diff -r c8b8f40f0dd0 -r 66ce340f0cd9 configure.in --- a/configure.in Fri Jan 05 19:07:48 2018 +0000 +++ b/configure.in Sun Jan 14 18:24:07 2018 +0200 @@ -14,8 +14,8 @@ 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], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/]) +AC_PREREQ([2.69]) +AC_INIT([geeqie],[m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD)],[geeqie-devel@lists.sourceforge.net],[],[http://www.geeqie.org/]) # Add -Werror to the default CFLAGS CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type" @@ -37,7 +37,7 @@ AC_ARG_ENABLE(developer, [ Development options: -AC_HELP_STRING([--enable-developer], [turn on developers mode [default=no]])], +AS_HELP_STRING([--enable-developer],[turn on developers mode [default=no]])], [ __IS_DEVELOPER=yes ], @@ -70,7 +70,7 @@ AC_ARG_ENABLE([debug-flags], [ Development options: -AC_HELP_STRING([--enable-debug-flags], [use compiler flags for debugging [default=no]])], [], +AS_HELP_STRING([--enable-debug-flags],[use compiler flags for debugging [default=no]])], [], [ if test "x${enable_developer}" != "xyes" then @@ -82,7 +82,7 @@ AC_ARG_ENABLE([debug-log], [ Development options: -AC_HELP_STRING([--enable-debug-log], [enable debugging messages [default=yes]])], [], [enable_debug_log="yes"]) +AS_HELP_STRING([--enable-debug-log],[enable debugging messages [default=yes]])], [], [enable_debug_log="yes"]) if test "x${enable_debug_flags}" != "xno" then @@ -110,7 +110,7 @@ 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]])], [], +AS_HELP_STRING([--enable-deprecated],[turn off checking of deprecated functions [default=yes]])], [], [ if test "x${enable_developer}" != "xyes" then @@ -130,11 +130,11 @@ fi -AC_ISC_POSIX +AC_SEARCH_LIBS([strerror],[cposix]) AC_PROG_CC AC_PROG_CC_C99 AC_PROG_CXX -AC_STDC_HEADERS +AC_HEADER_STDC AC_ARG_PROGRAM AC_SYS_LARGEFILE IT_PROG_INTLTOOL([0.35.0]) @@ -198,7 +198,7 @@ fi 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])]) +AC_ARG_ENABLE([gtk3], AS_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") @@ -217,7 +217,7 @@ threads="auto" AC_ARG_ENABLE([threads], - AC_HELP_STRING([--disable-threads], [disable thread support]), [threads="${enableval}"]) + AS_HELP_STRING([--disable-threads],[disable thread support]), [threads="${enableval}"]) have_gthread="no" if test "x${threads}" != "xno" ; then @@ -262,7 +262,7 @@ AC_MSG_CHECKING(if LIRC support is enabled) lirc=no AC_ARG_ENABLE([lirc], - AC_HELP_STRING([--disable-lirc], [disable lirc support (auto)]), + AS_HELP_STRING([--disable-lirc],[disable lirc support (auto)]), [ if test "x${enableval}" = "xyes" -a "x$GCC" = "xyes"; then AC_MSG_RESULT(yes) @@ -294,7 +294,7 @@ # ---------------------------------------------------------------------- AC_ARG_ENABLE([lcms], - AC_HELP_STRING([--disable-lcms], [disable lcms support]), + AS_HELP_STRING([--disable-lcms],[disable lcms support]), [liblcms=$enableval], [liblcms=auto]) if test "x${liblcms}" != "xno"; then @@ -327,7 +327,7 @@ # ---------------------------------------------------------------------- AC_ARG_ENABLE([jpeg], - AC_HELP_STRING([--disable-jpeg], [disable direct jpeg support]), + AS_HELP_STRING([--disable-jpeg],[disable direct jpeg support]), [libjpeg=$enableval], [libjpeg=auto]) if test "x${libjpeg}" != "xno"; then @@ -349,7 +349,7 @@ # ---------------------------------------------------------------------- AC_ARG_ENABLE([tiff], - AC_HELP_STRING([--disable-tiff], [disable direct tiff support]), + AS_HELP_STRING([--disable-tiff],[disable direct tiff support]), [libtiff=$enableval], [libtiff=auto]) if test "x${libtiff}" != "xno"; then @@ -397,7 +397,7 @@ # ---------------------------------------------------------------------- AC_ARG_ENABLE([exiv2], - AC_HELP_STRING([--disable-exiv2], [disable exiv2 support]), + AS_HELP_STRING([--disable-exiv2],[disable exiv2 support]), [libexiv2=$enableval], [libexiv2=auto]) if test "x${libexiv2}" != "xno"; then @@ -443,10 +443,10 @@ AC_ARG_ENABLE([map], AC_HELP_STRING([--disable-map], [disable map support]), - [libgps=$enableval], [libgps=auto]) + [libgps=$enableval], [libgps=no]) AC_ARG_ENABLE([gpu-accel], - AC_HELP_STRING([--disable-gpu-accel], [disable GPU acceleration support - experimental]), + AS_HELP_STRING([--enable-gpu-accel], [enable GPU acceleration support - experimental]), [libclutter=$enableval], [libclutter=auto]) if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then @@ -519,7 +519,7 @@ # ---------------------------------------------------------------------- AC_ARG_ENABLE([lua], - AC_HELP_STRING([--disable-lua], [disable lua support]), + AS_HELP_STRING([--disable-lua],[disable lua support]), [liblua=$enableval], [liblua=auto]) if test "x${liblua}" != "xno"; then @@ -632,18 +632,21 @@ Deprecated: $__IS_DEPRECATED Support: - LCMS: $HAVE_LCMS - Exiv2: $HAVE_EXIV2 - Lirc: $HAVE_LIRC - Clutter: $HAVE_CLUTTER - Libchamplain: $HAVE_LIBCHAMPLAIN - Libchamplain-gtk: $HAVE_LIBCHAMPLAIN_GTK - Lua: $HAVE_LUA - FFmpegthumbnailer: $HAVE_FFMPEGTHUMBNAILER + LCMS : $HAVE_LCMS + Exiv2 : $HAVE_EXIV2 + Lirc : $HAVE_LIRC + Clutter : $HAVE_CLUTTER + Libchamplain : $HAVE_LIBCHAMPLAIN + Libchamplain-gtk : $HAVE_LIBCHAMPLAIN_GTK + Lua : $HAVE_LUA + libjpeg : $HAVE_JPEG + libtiff : $HAVE_TIFF + libBPG : $HAVE_BPG + FFmpegthumbnailer : $HAVE_FFMPEGTHUMBNAILER Documentation: - Doxygen: $DX_DOXYGEN - doc-tool: $GNOME_DOC_TOOL + Doxygen : $DX_DOXYGEN + doc-tool : $GNOME_DOC_TOOL END