From 3cca6af4ae0d5a97b4d436b126278b332eba6192 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 22 Jan 2010 09:37:27 +0000 Subject: [PATCH] Use configure scripts included in the tarball, if they exist. This is to avoid problems caused by trying to re-generate the configure scripts using older versions of Autotools than the ones that were used to generate the scripts in the tarball. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3953 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- release/build-compat-osx | 4 +++- release/build-osx-64 | 4 +++- release/build-osx-m32 | 4 +++- unix/build-xorg-7.4 | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/release/build-compat-osx b/release/build-compat-osx index fd85bda4..af492c5f 100755 --- a/release/build-compat-osx +++ b/release/build-compat-osx @@ -15,7 +15,9 @@ CXXFLAGS=$CFLAGS LDFLAGS=$CFLAGS CPPFLAGS=$CFLAGS export CFLAGS CXXFLAGS LDFLAGS CPPFLAGS CC CXX CPP -autoreconf -fiv +if [ ! -f ./configure ]; then + autoreconf -fiv +fi configure --x-libraries=/usr/X11R6/lib/ make popd diff --git a/release/build-osx-64 b/release/build-osx-64 index 417450f7..3328a8ad 100755 --- a/release/build-osx-64 +++ b/release/build-osx-64 @@ -9,7 +9,9 @@ pushd $SCRIPTDIR/.. CFLAGS='-O3' CXXFLAGS=$CFLAGS export CFLAGS CXXFLAGS -autoreconf -fiv +if [ ! -f ./configure ]; then + autoreconf -fiv +fi configure --host=x86_64-apple-darwin10.0.0 NASM=/opt/local/bin/nasm make popd diff --git a/release/build-osx-m32 b/release/build-osx-m32 index f2feeaa3..02cb2954 100755 --- a/release/build-osx-m32 +++ b/release/build-osx-m32 @@ -10,7 +10,9 @@ CFLAGS='-O3 -m32' CXXFLAGS=$CFLAGS LDFLAGS=$CFLAGS export CFLAGS CXXFLAGS LDFLAGS -autoreconf -fiv +if [ ! -f ./configure ]; then + autoreconf -fiv +fi configure make popd diff --git a/unix/build-xorg-7.4 b/unix/build-xorg-7.4 index 69b5a03c..a783f603 100755 --- a/unix/build-xorg-7.4 +++ b/unix/build-xorg-7.4 @@ -78,7 +78,9 @@ init() popd cd .. - autoreconf -fiv + if [ ! -f ./configure ]; then + autoreconf -fiv + fi cd unix } -- 2.39.5