[vlc-devel] commit: Revert "configure: Detect fat contribs." ( Rafaël Carré )

git version control git at videolan.org
Mon Jan 4 13:35:14 CET 2010


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Jan  4 13:28:52 2010 +0100| [ca5e15a954a187ac922ce27d489187afbc36631e] | committer: Rafaël Carré 

Revert "configure: Detect fat contribs."

This reverts commit 65ed93af7b623248bae389f656698248fe52bf8f.

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

 configure.ac |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index b3ea619..a2c8b74 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}])




More information about the vlc-devel mailing list