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.

diff --git a/src/scripts/nightly/conf/ubuntu-pthread.i386.config b/src/scripts/nightly/conf/ubuntu-pthread.i386.config
index f8cb5d19390c124c1a9fe28c01aa9d94d3abea83..85daed16a0611326af4b36d305acc144b1f4e951 100644 (file)
--- 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 8f4f2d65f755208fc2bf3305e0ce44f5f86625aa..1b3edf178529a69dd8b1b69f7d05f24ee407ad6c 100755 (executable)
--- 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