mingw32: Look for contribs in /usr/win32 or /usr/win64

diff --git a/configure.ac b/configure.ac
index 3984a3dadc04c3cf559c4e233560748b5b7597b6..2035166d60263102bd0e0aaac9253bc7433f689d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -338,8 +338,21 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
         CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`"
         AS_IF([test ! -d "${CONTRIB_DIR}"], [
           echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
-          CONTRIB_DIR=""
-          AC_MSG_RESULT([not found])
+          AS_IF([test "${SYS}" = "mingw32"], [
+            if test "${HAVE_WIN64}" = "1"
+            then
+              CONTRIB_DIR="/usr/win64"
+            else
+              CONTRIB_DIR="/usr/win32"
+            fi
+            AS_IF([test ! -d "${CONTRIB_DIR}"], [
+              echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
+              CONTRIB_DIR=""
+              AC_MSG_RESULT([not found])
+            ])], [
+            CONTRIB_DIR=""
+            AC_MSG_RESULT([not found])
+          ])
         ])
       ])
     ])
@@ -352,6 +365,7 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
     AC_MSG_RESULT([disabled])
   ])
 ])
+
 AS_IF([test -n "${CONTRIB_DIR}"], [
   AS_IF([test -d "${CONTRIB_DIR}/lib"],[
     CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`
@@ -362,6 +376,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
   ])
 
 ])
+
 AS_IF([test -n "${CONTRIB_DIR}"], [
   AC_MSG_RESULT([${CONTRIB_DIR}])
   export PATH=${CONTRIB_DIR}/bin:$PATH