diff --git a/src/configure b/src/configure
index c9ed79c8f5..56d4bf5b19 100755
--- a/src/configure
+++ b/src/configure
@@ -808,7 +808,7 @@ echo "configure:807: checking setting DEF_PGPORT" >&5
 if test "${with_pgport+set}" = set; then
   withval="$with_pgport"
   cat >> confdefs.h <<EOF
-#define DEF_PGPORT "${DEF_PGPORT}"
+#define DEF_PGPORT "${withval}"
 EOF
  echo "$ac_t""$with_pgport" 1>&6
 else
@@ -1003,7 +1003,7 @@ fi
 
 echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
-if test "$ac_cv_prog_gcc" = "yes"; then
+if test $ac_cv_prog_gcc = yes; then
   GCC=yes
   ac_test_CFLAGS="${CFLAGS+set}"
   ac_save_CFLAGS="$CFLAGS"
diff --git a/src/configure.in b/src/configure.in
index cdca6b643e..b5233efebb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -230,7 +230,7 @@ AC_MSG_CHECKING(setting DEF_PGPORT)
 AC_ARG_WITH(
    pgport,
    [   --with-pgport=<portnum> change default startup port ],
-   AC_DEFINE_UNQUOTED(DEF_PGPORT, "${DEF_PGPORT}") AC_MSG_RESULT($with_pgport),
+   AC_DEFINE_UNQUOTED(DEF_PGPORT, "${withval}") AC_MSG_RESULT($with_pgport),
    AC_DEFINE_UNQUOTED(DEF_PGPORT, "5432") AC_MSG_RESULT(5432)
 )