[vlc-commits] commit: Fix contrib automatic non-detection ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr  8 23:40:23 2010 +0300| [ee88921f084584fcc75ad4bd7bbc8c953d882156] | committer: Rémi Denis-Courmont 

Fix contrib automatic non-detection

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

 configure.ac |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 568eeaa..1f4875f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,9 @@ dnl  Check for the contrib directory
 dnl
 AC_ARG_WITH(contrib,
     [  --without-contrib       do not use the libraries in CONTRIB_DIR],[],[])
-  AS_IF([test "${with_contrib}" != "no"],[
-    AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
-    if test -z "$CONTRIB_DIR"
-    then
+AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
+AS_IF([test "${with_contrib}" != "no"],[
+  AS_IF([test -z "$CONTRIB_DIR"], [
       topdir="`dirname $0`"
       if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
          topdir="`pwd`/$topdir"
@@ -122,8 +121,8 @@ AC_ARG_WITH(contrib,
         gccmachine=`$CC -dumpmachine`
         CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
       fi
-    fi
-    AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
+  ])
+  AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
   AS_IF([test -d "${CONTRIB_DIR}/lib"],[
     AC_MSG_RESULT([yes])
     AC_SUBST(CONTRIB_DIR)
@@ -158,9 +157,10 @@ AC_ARG_WITH(contrib,
       export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
       export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
     fi
-    ],[
-       AC_MSG_RESULT([no])
-    ])
+  ],[
+    AC_MSG_RESULT([no])
+    CONTRIB_DIR=""
+  ])
 ])
 dnl
 dnl  Set default values