From 3fc7c1ef69eba2a0f9bd108492a8b3ed4d42347c Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 23 Jan 2017 12:29:44 -0800
Subject: [PATCH] Fix handling of ltrace 0.5.3 peculiarity.

Also, remove 0.5.2 selection - no longer available for download.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/debug/ltrace.in            | 14 +++++---------
 scripts/build/debug/400-ltrace.sh |  5 +++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index b506461c..fc5822d2 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -18,18 +18,12 @@ choice
 config LTRACE_V_0_7_3
     bool
     prompt "0.7.3"
-    select LTRACE_0_5_3_or_later
 
 config LTRACE_V_0_5_3
     bool
     prompt "0.5.3 (OBSOLETE)"
-    select LTRACE_0_5_3_or_later
-    depends on OBSOLETE
-
-config LTRACE_V_0_5_2
-    bool
-    prompt "0.5.2 (OBSOLETE)"
     depends on OBSOLETE
+    select LTRACE_0_5_3_CONFIGURE
 
 endchoice
 
@@ -39,7 +33,9 @@ config LTRACE_VERSION
 # CT_INSERT_VERSION_STRING_BELOW
     default "0.7.3" if LTRACE_V_0_7_3
     default "0.5.3" if LTRACE_V_0_5_3
-    default "0.5.2" if LTRACE_V_0_5_2
 
-config LTRACE_0_5_3_or_later
+# Ltrace 0.5.3 had a unique hand-crafted configure script that has to be
+# run differently from any preceding or following releases. This serves
+# as a reminder to remove that code once 0.5.3 support is dropped.
+config LTRACE_0_5_3_CONFIGURE
     bool
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 2926876b..6b860e92 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -27,8 +27,9 @@ do_debug_ltrace_build() {
     CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
 
     CT_DoLog EXTRA "Configuring ltrace"
-    # ltrace-0.5.3, and later, don't use GNU Autotools configure script anymore
-    if [ "${CT_LTRACE_0_5_3_or_later}" = "y" ]; then
+    # ltrace-0.5.3 has a unique hand-crafted configure script. Releases
+    # 0.5.2 and earlier as well as 0.6.0 and later use GNU autotools.
+    if [ "${LTRACE_0_5_3_CONFIGURE}" = "y" ]; then
         case "${CT_ARCH}:${CT_ARCH_BITNESS}" in
             x86:32)     ltrace_host="i386";;
             x86:64)     ltrace_host="x86_64";;