From 395b79571f542bd81f02c70cf68c4925d9a70d72 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 12 Jan 2015 16:47:57 +0100 Subject: [PATCH] use = instead of == in shell tests, this makes the configure 'Portability.' patch from pkgsrc obsolete (cherry picked from commit 14cd37570e6772dc2bd866f503302c5eb46c7f11) Conflicts: m4/pdns_with_mysql.m4 m4/pdns_with_postgresql.m4 --- m4/pdns_with_mysql.m4 | 4 ++-- m4/pdns_with_postgresql.m4 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/pdns_with_mysql.m4 b/m4/pdns_with_mysql.m4 index a0ddb733d..48645eb5d 100644 --- a/m4/pdns_with_mysql.m4 +++ b/m4/pdns_with_mysql.m4 @@ -39,7 +39,7 @@ AC_DEFUN([PDNS_WITH_MYSQL],[ MYSQL_config="" if test "x$MYSQL_config_check" != "xskip"; then AC_MSG_CHECKING([for mysql_config]) - if test "x$MYSQL_config_check" == "x"; then + if test "x$MYSQL_config_check" = "x"; then # check if it's in path for m in /bin /usr/bin /usr/local/bin /opt/csw/bin; do if test -x $m/mysql_config; then @@ -48,7 +48,7 @@ AC_DEFUN([PDNS_WITH_MYSQL],[ fi done - if test "x$MYSQL_config" == "x"; then + if test "x$MYSQL_config" = "x"; then AC_MSG_RESULT([not found]) else AC_MSG_RESULT([$MYSQL_config]) diff --git a/m4/pdns_with_postgresql.m4 b/m4/pdns_with_postgresql.m4 index 60d54ffa8..decc69334 100644 --- a/m4/pdns_with_postgresql.m4 +++ b/m4/pdns_with_postgresql.m4 @@ -27,7 +27,7 @@ AC_DEFUN([PDNS_WITH_POSTGRESQL],[ [location of pg_config] ), [PGSQL_pg_config="$withval" - if test "x$PGSQL_pg_config" == "xyes" || test ! -x "$PGSQL_pg_config"; then + if test "x$PGSQL_pg_config" = "xyes" || test ! -x "$PGSQL_pg_config"; then AC_MSG_ERROR([--with-pgsql-config must provide a valid path to pg_config executable]) fi ], @@ -35,10 +35,10 @@ AC_DEFUN([PDNS_WITH_POSTGRESQL],[ ) if test "x$PGSQL_pg_config" != "x"; then - if test "x$PGSQL_lib_check" == "x"; then + if test "x$PGSQL_lib_check" = "x"; then PGSQL_lib_check=$($PGSQL_pg_config --libdir) fi - if test "x$PGSQL_inc_check" == "x"; then + if test "x$PGSQL_inc_check" = "x"; then PGSQL_inc_check=$($PGSQL_pg_config --includedir) fi PGSQL_CFLAGS= -- 2.40.0