[gnuastro-commits] master eaade0b: Check for libtool rejects Gnuastro's own libtool implementation

[Mohammad Akhlaghi]

branch: master
commit eaade0ba09b26fdc6b0a164a5445aa4c264ab394
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    Check for libtool rejects Gnuastro's own libtool implementation
    
    On some systems, `AC_CHECK_PROG' will also look into the current directory
    for an executable. Therefore, it will find Gnuastro's own `libtool'
    implementation even if the system doesn't have Libtool. So at configure
    time, Gnuastro will think there is a libtool, but at check time
    BuildProgram's check is going to crash.
    
    This bug was reported by Lee Spitler.
    
    This fixes bug #52427.
---
 NEWS                         |  3 +++
 configure.ac                 | 11 +++++++++--
 doc/announce-acknowledge.txt |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 85a9301..160ef2a 100644
--- a/NEWS
+++ b/NEWS
@@ -154,6 +154,9 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
 
   Arithmetic crash with no input tokens (bug #52422).
 
+  Libtool checks only in non-current directory (bug #52427).
+
+
 
 
 
diff --git a/configure.ac b/configure.ac
index b2b1946..f407dff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,8 @@ AC_SUBST(HAVE_LIBGIT2, [$has_libgit2])
 
 
 # Check the libtool executable: needed by BuildProgram.
-AC_CHECK_PROG(has_libtool, libtool, [yes], [no])
+AC_CHECK_PROG(has_libtool, libtool, [yes], [no], ,
+              ./libtool .//libtool $ac_pwd/libtool)
 
 # If Libtool is present, make sure it is GNU Libtool
 AS_IF([test "x$has_libtool" = "xyes"],
@@ -729,6 +730,7 @@ AC_OUTPUT
 
 
 
+
 # Print a message if necessary
 AS_IF([test x$enable_guide_message = xyes],
 [
@@ -764,7 +766,12 @@ AS_IF([test x$enable_guide_message = xyes],
                AS_ECHO(["    warning is only to let you know that BuildProgram 
will not be"])
                AS_ECHO(["    part of this build. The executable names searched 
were \`libtool'"])
                AS_ECHO(["    and \`glibtool'."])
-               AS_ECHO([]) ])
+               AS_ECHO([])
+               AS_IF([test "x$has_libtool" = "xyes"],
+                     [AS_ECHO(["    -- A libtool implementation was found, but 
it isn't GNU."])
+                      AS_ECHO([])
+                     ])
+              ])
         AS_IF([test "x$has_ghostscript" = "xno"],
               [AS_ECHO(["  - GPL GhostScript version 9.10 or later, with the 
executable"])
                AS_ECHO(["    name \`gs', was not found in your PATH 
environment variable."])
diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index 81133db..3956aa7 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -8,5 +8,6 @@ Takashi Ichikawa
 Raúl Infante Sainz
 Alan Lefor
 Alejandro Serrano Borlaff
+Lee Spitler
 Ole Streicher
 David Valls-Gabaud