| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame^] | 1 | Instead of just looking for a libtool binary, actually configure libtool. |
| 2 | |
| 3 | As the build doesn't use automake we need to manually set top_builddir in the Makefile. |
| 4 | |
| 5 | Upstream-Status: Inactive-Upstream [2014] |
| 6 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 7 | |
| 8 | diff --git a/Makefile.in b/Makefile.in |
| 9 | index a2b5494..aa0b8ca 100644 |
| 10 | --- a/Makefile.in |
| 11 | +++ b/Makefile.in |
| 12 | @@ -36,6 +36,7 @@ |
| 13 | # |
| 14 | srcdir = @srcdir@ |
| 15 | VPATH = @srcdir@ |
| 16 | +top_builddir = @srcdir@ |
| 17 | |
| 18 | # |
| 19 | # the name of the install program to use |
| 20 | diff --git a/etc/configure.ac b/etc/configure.ac |
| 21 | index e444543..b137443 100644 |
| 22 | --- a/etc/configure.ac |
| 23 | +++ b/etc/configure.ac |
| 24 | @@ -161,42 +161,7 @@ AS_IF([test "x$with_gcrypt" != xno], AC_GCRYPT_SETUP()) |
| 25 | dnl! |
| 26 | dnl! Now look for libtool. |
| 27 | dnl! |
| 28 | -AC_CHECK_PROGS(LIBTOOL, libtool) |
| 29 | -if test -z "$LIBTOOL" |
| 30 | -then |
| 31 | - AC_MSG_RESULT([ |
| 32 | - You must have GNU Libtool installed to build srecord. |
| 33 | - Homepage: http://www.gnu.org/software/libtool/]) |
| 34 | - OK=no |
| 35 | - if apt-get --version > /dev/null 2> /dev/null; then |
| 36 | - AC_MSG_RESULT([ |
| 37 | - The following command may be used to install it: |
| 38 | - sudo apt-get install libtool |
| 39 | - ]) |
| 40 | - OK=yes |
| 41 | - fi |
| 42 | - if yum --version > /dev/null 2> /dev/null; then |
| 43 | - AC_MSG_RESULT([ |
| 44 | - The following command may be used to install it: |
| 45 | - sudo yum install libtool |
| 46 | - ]) |
| 47 | - OK=yes |
| 48 | - fi |
| 49 | - if pkg_info -a > /dev/null 2> /dev/null; then |
| 50 | - AC_MSG_RESULT([ |
| 51 | - The following command may be used to install it: |
| 52 | - sudo pkg_add -r libtool |
| 53 | - ]) |
| 54 | - OK=yes |
| 55 | - fi |
| 56 | - if test "$OK" != "yes"; then |
| 57 | - AC_MSG_RESULT([ |
| 58 | - If you are using a package based install, you will need the |
| 59 | - libtool package. |
| 60 | - ]) |
| 61 | - fi |
| 62 | - exit 1 |
| 63 | -fi |
| 64 | +LT_INIT |
| 65 | |
| 66 | dnl |
| 67 | dnl If the soelim program exists, and understands the -I option, |