[vlc-commits] Revert "mingw32: Look for contribs in /usr/win32 or /usr/win64"

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Nov 22 11:57:19 2011 -0500| [f10fda0ce189fc268be42bd94006a8d1033bbccb] | committer: Rafaël Carré

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

This reverts commit ec76c41b3dce28ba672b8aaab8b6a1e1616b408b.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f10fda0ce189fc268be42bd94006a8d1033bbccb
---

 configure.ac |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2035166..3984a3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,21 +338,8 @@ 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
-          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])
-          ])
+          CONTRIB_DIR=""
+          AC_MSG_RESULT([not found])
         ])
       ])
     ])
@@ -365,7 +352,6 @@ 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`
@@ -376,7 +362,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
   ])
 
 ])
-
 AS_IF([test -n "${CONTRIB_DIR}"], [
   AC_MSG_RESULT([${CONTRIB_DIR}])
   export PATH=${CONTRIB_DIR}/bin:$PATH