diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-02-27 11:04:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 11:04:12 +0100 |
| commit | f3e10e2eeb79d1cfd3cb53019d204447baf2d8ac (patch) | |
| tree | 111acc5f4bc8594b27c1c300aacf08ea4af43aa5 | |
| parent | f78661f84d8c0d7912b31a1b19c2a0cd4f85d061 (diff) | |
| parent | 58fc8bb041bc804342eae09a5c3139069e182f19 (diff) | |
| download | PROJ-f3e10e2eeb79d1cfd3cb53019d204447baf2d8ac.tar.gz PROJ-f3e10e2eeb79d1cfd3cb53019d204447baf2d8ac.zip | |
Merge pull request #1295 from rouault/configure_remove_bashism
configure.ac: replace '==' by '=' to avoid Bashism (patch by Greg Troxel)
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1135b4a4..d0aecf75 100644 --- a/configure.ac +++ b/configure.ac @@ -326,7 +326,7 @@ AC_ARG_WITH(external-gtest, AS_HELP_STRING([--with-external-gtest], [Whether to use external Google Test]),,) -if test "x$with_external_gtest" == "xyes" ; then +if test "x$with_external_gtest" = "xyes" ; then AC_MSG_RESULT([using external GTest.]) PKG_CHECK_MODULES([GTEST], [gtest >= 1.8.0]) else @@ -334,7 +334,7 @@ else GTEST_CFLAGS="-I\$(top_srcdir)/test/googletest/include" GTEST_LIBS="\$(top_builddir)/test/googletest/libgtest.la" fi -AM_CONDITIONAL(USE_EXTERNAL_GTEST, [test "x$with_external_gtest" == "xyes"]) +AM_CONDITIONAL(USE_EXTERNAL_GTEST, [test "x$with_external_gtest" = "xyes"]) AC_SUBST(GTEST_CFLAGS,$GTEST_CFLAGS) AC_SUBST(GTEST_LIBS,$GTEST_LIBS) diff --git a/data/Makefile.am b/data/Makefile.am index 7594fd8d..98f3557a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -72,7 +72,7 @@ proj.db: $(DATAPATH)/sql/*.sql fi; \ echo "" | head -c1; \ if [ $$? -eq 0 ] ; then \ - echo "Running foreign_key_check"; \ + echo "Running foreign_key_check"; \ if [[ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]]; then \ echo "Foreign key check failed"; \ $(RM) proj.db; \ |