#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#   http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied.  See the License for the
# specific language governing permissions and limitations
# under the License.
#
#

set -e
set -x

branch="$(basename $(svn info . | grep ^URL  | cut -d' ' -f2))"
(cd .. && gmake BRANCH="$branch")

#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#   http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied.  See the License for the
# specific language governing permissions and limitations
# under the License.
#
#

set -e
set -x

# needs autoconf-2.64 installed
export AUTOCONF_VERSION=2.64

branch="$(basename $(svn info . | grep ^URL  | cut -d' ' -f2))"
(cd .. && gmake BRANCH="$branch")

--- 
+++ 
@@ -22,8 +22,5 @@
 set -e
 set -x
 
-# needs autoconf-2.64 installed
-export AUTOCONF_VERSION=2.64
-
 branch="$(basename $(svn info . | grep ^URL  | cut -d' ' -f2))"
 (cd .. && gmake BRANCH="$branch")
Revert r1137461 as AUTOCONF_VERSION is now set from the buildbot config.
Setting it from two different places is just going to cause trouble.

* tools/buildbot/slaves/bb-openbsd/svnbuild.sh: Don't tweak AUTOCONF_VERSION.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1137462 13f79535-47bb-0310-9956-ffa450edef68
