Mercurial > hg > forks > geeqie
diff configure.in @ 2349:6f49b2b7d2e0
Configuration options and documentation
Configuration option changes:
--enable-gps is now --enable-map
--enable-clutter is now --enable-gpu-accel
If --disable-gtk3 is issued, both map and gpu-accel options are also
disabled.
--enable-map is the only option required to compile in the map.
README updated accordingly.
author | Colin Clark <cclark@mcb.net> |
---|---|
date | Tue, 24 May 2016 14:22:28 +0100 |
parents | 1f3c1bf9b4ba |
children | 95507e596256 |
line wrap: on
line diff
--- a/configure.in Tue May 24 13:59:50 2016 +0100 +++ b/configure.in Tue May 24 14:22:28 2016 +0100 @@ -404,31 +404,38 @@ AC_SUBST(LDFLAGS) -# clutter support - experimental +# clutter and champlain support # ---------------------------------------------------------------------- -AC_ARG_ENABLE([clutter], - AC_HELP_STRING([--enable-clutter], [enable clutter support - experimental]), +AC_ARG_ENABLE([map], + AC_HELP_STRING([--enable-map], [enable map support]), + [libgps=$enableval], [libgps=no]) + +AC_ARG_ENABLE([gpu-accel], + AC_HELP_STRING([--enable-gpu-accel], [enable GPU acceleration 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], + if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then + PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0], [ - HAVE_CLUTTER=yes - AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library]) + 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_GTK_PKG_ERRORS]) + AC_MSG_WARN([$CLUTTER_PKG_ERRORS]) ]) - - ], - [ - HAVE_CLUTTER=no - AC_MSG_WARN([$CLUTTER_PKG_ERRORS]) - ]) + else + HAVE_CLUTTER=disabled + fi else HAVE_CLUTTER=disabled fi @@ -439,23 +446,23 @@ AC_SUBST(CLUTTER_GTK_LIBS) -# Libchamplain support - used for GPS map facility - experimental +# Libchamplain support - used for map facility # ---------------------------------------------------------------------- -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]) - ]) +if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes"; then + if test "x${gtk3}" != "xno"; then + PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], + [ + HAVE_LIBCHAMPLAIN=yes + AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of maps]) + ], + [ + HAVE_LIBCHAMPLAIN=no + AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS]) + ]) + else + HAVE_LIBCHAMPLAIN=disabled + fi else HAVE_LIBCHAMPLAIN=disabled fi @@ -464,7 +471,7 @@ 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]) + AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of maps]) ], [ HAVE_LIBCHAMPLAIN_GTK=no