Commit ec76c41b authored by Rafaël Carré's avatar Rafaël Carré

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

parent 9fc4cceb
...@@ -338,8 +338,21 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [ ...@@ -338,8 +338,21 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`" CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`"
AS_IF([test ! -d "${CONTRIB_DIR}"], [ AS_IF([test ! -d "${CONTRIB_DIR}"], [
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR="" AS_IF([test "${SYS}" = "mingw32"], [
AC_MSG_RESULT([not found]) 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"], [ ...@@ -352,6 +365,7 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
AC_MSG_RESULT([disabled]) AC_MSG_RESULT([disabled])
]) ])
]) ])
AS_IF([test -n "${CONTRIB_DIR}"], [ AS_IF([test -n "${CONTRIB_DIR}"], [
AS_IF([test -d "${CONTRIB_DIR}/lib"],[ AS_IF([test -d "${CONTRIB_DIR}/lib"],[
CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd` CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`
...@@ -362,6 +376,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [ ...@@ -362,6 +376,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
]) ])
]) ])
AS_IF([test -n "${CONTRIB_DIR}"], [ AS_IF([test -n "${CONTRIB_DIR}"], [
AC_MSG_RESULT([${CONTRIB_DIR}]) AC_MSG_RESULT([${CONTRIB_DIR}])
export PATH=${CONTRIB_DIR}/bin:$PATH export PATH=${CONTRIB_DIR}/bin:$PATH
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment