diff --git a/configure b/configure
index eddf07ba9c3..f189c9969af 100755
--- a/configure
+++ b/configure
@@ -12416,7 +12416,7 @@ This is an error since --with-zlib was requested." "$LINENO" 5 ;;
 esac
 fi
 
-if test "x$enable_tools" != xno
+if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes
 then
     if test "$ac_cv_header_gettext_po_h" = "yes"
     then
@@ -12465,9 +12465,7 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
 fi
 
     fi
-    if test "x$with_gettextpo" = xyes
-    then
-        if test "x$GETTEXTPO_LIBS" = "x"; then :
+    if test "x$GETTEXTPO_LIBS" = "x"; then :
   case "x$with_gettextpo" in
   x)   as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;;
   xno) ;;
@@ -12475,7 +12473,7 @@ fi
 This is an error since --with-gettextpo was requested." "$LINENO" 5 ;;
 esac
 fi
-        if test "$srcdir" != .; then :
+    if test "$srcdir" != .; then :
   case "x$with_gettextpo" in
   x)   as_fn_append wine_notices "|Rebuilding po files is not supported for out of tree builds." ;;
   xno) ;;
@@ -12483,7 +12481,6 @@ fi
 This is an error since --with-gettextpo was requested." "$LINENO" 5 ;;
 esac
 fi
-    fi
 fi
 
 if test "x$with_pulse" != "xno";
diff --git a/configure.ac b/configure.ac
index 73e4140e74b..e20cbe7fa46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,7 +1435,7 @@ fi
 WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.])
 
 dnl **** Check for gettextpo ****
-if test "x$enable_tools" != xno
+if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes
 then
     if test "$ac_cv_header_gettext_po_h" = "yes"
     then
@@ -1443,13 +1443,10 @@ then
                      [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).])
                       AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")])
     fi
-    if test "x$with_gettextpo" = xyes
-    then
-        WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"],
-          [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
-        WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .],
-          [Rebuilding po files is not supported for out of tree builds.])
-    fi
+    WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"],
+      [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
+    WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .],
+      [Rebuilding po files is not supported for out of tree builds.])
 fi
 
 dnl **** Check for PulseAudio ****