Fix contrib automatic non-detection

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,7 +121,7 @@ AC_ARG_WITH(contrib,
         gccmachine=`$CC -dumpmachine`
         CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
       fi
-    fi
+  ])
   AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
   AS_IF([test -d "${CONTRIB_DIR}/lib"],[
     AC_MSG_RESULT([yes])
@@ -160,6 +159,7 @@ AC_ARG_WITH(contrib,
     fi
   ],[
     AC_MSG_RESULT([no])
+    CONTRIB_DIR=""
   ])
 ])
 dnl