do not use config.guess anymore

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40679 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 102dc0e49b6545abb8d41128e33eb676ce7d1a44..1826fa7e2a122523308acc166d2bb584ae4448ea 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -216,8 +216,6 @@ LyxAppPrefix="${LyxAppDir}.app"
 # if zip file is needed... remove the comment sign
 #LyxAppZip="${LyxAppPrefix}.zip"
 
-BuildSystem=`"${LyxSourceDir}/config/config.guess"`
-
 # ---------------------------------
 # DON'T MODIFY ANYTHING BELOW HERE!
 # ---------------------------------
@@ -318,7 +316,6 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
                "${HunSpellSourceDir}/configure"\
                        --prefix="${HunSpellInstallDir}"\
                        ${HunspellConfigureOptions}
-                       #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
                make && make install${strip}
                for file in ${FILE_LIST} ; do
                        if [ -f "${HunSpellInstallDir}"/lib/${file} ]; then
@@ -383,7 +380,6 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
                CXXFLAGS=-g "${ASpellSourceDir}/configure"\
                        --prefix="${ASpellInstallDir}"\
                        ${AspellConfigureOptions}
-                       #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
                make && make install${aspellstrip}
                for file in ${FILE_LIST} ; do
                        if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
@@ -492,7 +488,7 @@ build_lyx() {
                        --prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
                        ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
                        ${LyXConfigureOptions}\
-                       --host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
+                       --enable-build-type=rel && \
                make -j2 && make install${strip}
                for file in ${LYX_FILE_LIST} ; do
                        if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then

diff --git a/status.20x b/status.20x
index 5a585797d4acd464557f66c81fd57fd8d5925e93..a59a3fb27c7283c5e899f24c32314ea3b6a6247b 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -235,3 +235,5 @@ What's new
 
 - Fix installation of python files (bug 6080, bug 7990).
 
+- When building LyX package on Mac don't call configure with --build anymore.
+  It's guessed by configure anyway.