@@ -8,12 +8,12 @@ AC_ARG_WITH(tor-browser-bundle,

             AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM],

                            [location of the clone of tor-browser-bundle.git]),

             [tor_browser_bundle_dir=$withval])

-VERSIONS_PATH="${tor_browser_bundle_dir}/gitian/versions"

-if ! sh -n "$VERSIONS_PATH" 2>/dev/null; then

+GET_TB_VERSION="${tor_browser_bundle_dir}/gitian/get-tb-version"

+if ! test -x "$GET_TB_VERSION"; then

     AC_MSG_ERROR([Please clone tor-browser-bundle.git and specify its location using --with-tor-browser-bundle])

 fi

-TOR_BROWSER_VERSION=$(. "$VERSIONS_PATH"; echo "$TORBROWSER_VERSION")

+TOR_BROWSER_VERSION=$(eval $(GIT_DIR=${tor_browser_bundle_dir}/.git $GET_TB_VERSION); echo "$TORBROWSER_VERSION")

 if test "x$TOR_BROWSER_VERSION" = "x"; then

     AC_MSG_ERROR([Couldn't determine Tor Browser version.])

 fi