[vlc-devel] commit: configure: Detect fat contribs. (Pierre d'Herbemont )

git version control git at videolan.org
Fri Jan 1 18:44:22 CET 2010


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Thu Dec 31 19:33:06 2009 +0100| [65ed93af7b623248bae389f656698248fe52bf8f] | committer: Pierre d'Herbemont 

configure: Detect fat contribs.

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

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

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




More information about the vlc-devel mailing list