From: Rafaël Carré <rafael.carre@gmail.com>
Date: Mon, 4 Jan 2010 12:28:52 +0000 (+0100)
Subject: Revert "configure: Detect fat contribs."
X-Git-Tag: 1.1.0-ff~1484
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ca5e15a954a187ac922ce27d489187afbc36631e;hp=a3bcd2df4f6ac2825d5b02e407d3258800a8b899;p=vlc

Revert "configure: Detect fat contribs."

This reverts commit 65ed93af7b623248bae389f656698248fe52bf8f.
---

diff --git a/configure.ac b/configure.ac
index b3ea619c13..a2c8b74c08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,15 +125,11 @@ AC_ARG_WITH(contrib,
       if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
          topdir="`pwd`/$topdir"
       fi
-      CONTRIB_DIR=${topdir}/extras/contrib/hosts/fat
+      CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
       if ! test -d "$CONTRIB_DIR"
       then
-          CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
-          if ! test -d "$CONTRIB_DIR"
-          then
-            gccmachine=`$CC -dumpmachine`
-            CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
-          fi
+        gccmachine=`$CC -dumpmachine`
+        CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
       fi
     fi
     AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])