Mercurial > hg > forks > geeqie

comparison configure.in @ 2901:ce889887354f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid non-portable == for the test command The test command doesn't accept `==` as operator. It should be a single `=` for portable use. The `==` is a gnu extension. Note that the x-trick hasn't been needed for a long, long time. You can reliably write it with quotes: ``` if test "$gtk3" = yes; then ``` but I left that alone since it doesn't hurt other than being ugly.
author Rhialto The M <Rhialto@users.noreply.github.com>
date Sat, 06 Oct 2018 18:26:43 +0200
parents 0c4659cd6d32
children ed4e22060177
comparison
equal deleted inserted replaced
2844:2e385b95cb0d 2901:ce889887354f
198 fi 198 fi
199 199
200 AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.)) 200 AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
201 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])]) 201 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])])
202 202
203 if test x$gtk3 == xyes; then 203 if test x$gtk3 = xyes; then
204 AC_MSG_WARN("Gtk3 enabled") 204 AC_MSG_WARN("Gtk3 enabled")
205 m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))]) 205 m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
206 else 206 else
207 if test x$gtk3 != xno; then 207 if test x$gtk3 != xno; then
208 AC_MSG_WARN("Gtk3 is preferred...") 208 AC_MSG_WARN("Gtk3 is preferred...")
209 m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,[gtk3=no])]) 209 m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,[gtk3=no])])
210 fi 210 fi
211 fi 211 fi
212 212
213 if test x$gtk3 == xno; then 213 if test x$gtk3 = xno; then
214 m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))]) 214 m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))])
215 true 215 true
216 fi 216 fi
217 217
218 threads="auto" 218 threads="auto"
477 477
478 478
479 # Libchamplain support - used for map facility 479 # Libchamplain support - used for map facility
480 # ---------------------------------------------------------------------- 480 # ----------------------------------------------------------------------
481 481
482 if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" == "xyes"; then 482 if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then
483 if test "x${gtk3}" != "xno"; then 483 if test "x${gtk3}" != "xno"; then
484 PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], 484 PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12],
485 [ 485 [
486 HAVE_LIBCHAMPLAIN=yes 486 HAVE_LIBCHAMPLAIN=yes
487 AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of maps]) 487 AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of maps])
495 fi 495 fi
496 else 496 else
497 HAVE_LIBCHAMPLAIN=disabled 497 HAVE_LIBCHAMPLAIN=disabled
498 fi 498 fi
499 499
500 if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" == "xyes" ; then 500 if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
501 PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12], 501 PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12],
502 [ 502 [
503 HAVE_LIBCHAMPLAIN_GTK=yes 503 HAVE_LIBCHAMPLAIN_GTK=yes
504 AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of maps]) 504 AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of maps])
505 ], 505 ],