[lmi-commits] [lmi] master 5f266c6 15/15: Consistently use the same config.guess in all build scripts

[Greg Chicares]

branch: master
commit 5f266c68bedfdfe6901a36dd877c4e039e6b9487
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Consistently use the same config.guess in all build scripts
    
    This has the advantage of ensuring that all third party libraries use
    the same build type and also corrects a problem that could arise when
    building wxPdfDoc on a system where Git was configured to perform
    automatic EOL translations (i.e. core.autocrlf==true), as using
    configu.guess included in wxPdfDoc repository in a shell script resulted
    in an error in this case, due to the presence of extraneous CR
    characters in it.
---
 install_wx.sh       | 4 ++--
 install_wxpdfdoc.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install_wx.sh b/install_wx.sh
index 2ff0fcd..531a505 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -44,9 +44,9 @@ exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 srcdir=$(dirname "$(readlink --canonicalize "$0")")
 wx_dir="$srcdir/third_party/wx"
 
-# Script commands 
##############################################################
+build_type=$(/usr/share/libtool/build-aux/config.guess)
 
-build_type=$("$wx_dir"/config.guess)
+# Script commands 
##############################################################
 
 case "$build_type" in
     (*-*-cygwin*)
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 464ec25..45a014f 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -44,9 +44,9 @@ exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 srcdir=$(dirname "$(readlink --canonicalize "$0")")
 wxpdfdoc_dir="$srcdir/third_party/wxpdfdoc"
 
-# Script commands 
##############################################################
+build_type=$(/usr/share/libtool/build-aux/config.guess)
 
-build_type=$("$wxpdfdoc_dir"/admin/build-aux/config.guess)
+# Script commands 
##############################################################
 
 case "$build_type" in
     (*-*-cygwin*)