[lmi-commits] [lmi] master 6ca1815f: Refresh lib{xml2, xslt} build files if necessary

[Greg Chicares]

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

    Refresh lib{xml2,xslt} build files if necessary
    
    If the build files already exist locally, rerun autoreconf to update
    them if necessary, e.g. if the dependencies (such as configure.ac) or
    the tools themselves changed.
    
    This fixes build errors when building on a machine with an existing lmi
    build after the recent libxslt submodule update.
    
    This commit is best viewed ignoring whitespace-only changes.
---
 install_xml_libraries.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/install_xml_libraries.sh b/install_xml_libraries.sh
index 8708bdb6..3e3a3afb 100755
--- a/install_xml_libraries.sh
+++ b/install_xml_libraries.sh
@@ -206,9 +206,15 @@ export XML_CATALOG_FILES="$throwaway_catalog"
 
 for lib in libxml2 libxslt; do
     libdir="$srcdir/third_party/$lib"
-    if [ ! -x "$libdir/configure" ]; then
-        cd "$libdir"
+    cd "$libdir"
+    if [ ! -x "configure" ]; then
         NOCONFIGURE=1 ./autogen.sh
+    else
+        # Just refresh the existing build files if necessary: we don't use
+        # autogen.sh in this case because it forces recreating them, which is
+        # usually unnecessary, but we do want to do it if any of configure
+        # dependencies (e.g. configure.ac) changes.
+        autoreconf --install
     fi
     mkdir --parents "$build_dir/$lib"
     cd "$build_dir/$lib"
@@ -235,10 +241,10 @@ done
 # shellcheck disable=SC2043
 for lib in xmlwrapp; do
     libdir="$srcdir/third_party/$lib"
-    if [ ! -x "$libdir/configure" ]; then
-        cd "$libdir"
-        autoreconf --install
-    fi
+    # As this library doesn't have any special autogen.sh script, we can just
+    # always run autoreconf unconditionally (without "--force").
+    cd "$libdir"
+    autoreconf --install
     mkdir --parents "$build_dir/$lib"
     cd "$build_dir/$lib"
     # shellcheck disable=SC2086