From 1047c5703f9432822efa06676ff198518dedf486 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Thu, 25 Sep 2008 21:12:24 -0600
Subject: [PATCH] Correction for Ubuntu Conversion

Change nightlybuild.sh to allow the setting of the pthread
option for ./configure.  Remove the incorrectly added xml
header line from the ubuntu-pthread.i386.config file.
---
 src/scripts/nightly/conf/ubuntu-pthread.i386.config | 1 -
 src/scripts/nightly/nightlybuild.sh                 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/scripts/nightly/conf/ubuntu-pthread.i386.config b/src/scripts/nightly/conf/ubuntu-pthread.i386.config
index f8cb5d19..85daed16 100644
--- a/src/scripts/nightly/conf/ubuntu-pthread.i386.config
+++ b/src/scripts/nightly/conf/ubuntu-pthread.i386.config
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="Windows-1252"?>
 SCRIPTDIR=/home/empire
 BOXDIR=boxes
 LOGDIR=logs
diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh
index 8f4f2d65..1b3edf17 100755
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@@ -175,7 +175,7 @@ fi
 
 git-pull
 sh ./bootstrap
-./configure --prefix ${BOXDIR}/${WORKDIR}/emp4
+./configure --prefix ${BOXDIR}/${WORKDIR}/emp4 ${CONFIGURE_OPTIONS}
 
 		;;
 esac