From: Rhialto The M Date: Sat, 6 Oct 2018 16:26:43 +0000 (+0200) Subject: Avoid non-portable == for the test command X-Git-Tag: v1.5~25^3 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=16c210a39c28c836781472a54285d5078ae07b6c 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. --- diff --git a/configure.in b/configure.in index 6fb207e2..751e9fb8 100644 --- a/configure.in +++ b/configure.in @@ -200,7 +200,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])]) -if test x$gtk3 == xyes; then +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 @@ -210,7 +210,7 @@ else fi fi -if test x$gtk3 == xno; then +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 @@ -479,7 +479,7 @@ AC_SUBST(CLUTTER_GTK_LIBS) # Libchamplain support - used for map facility # ---------------------------------------------------------------------- -if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" == "xyes"; then +if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then if test "x${gtk3}" != "xno"; then PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12], [ @@ -497,7 +497,7 @@ else HAVE_LIBCHAMPLAIN=disabled fi -if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" == "xyes" ; then +if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12], [ HAVE_LIBCHAMPLAIN_GTK=yes