Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Fix build scripts to use correct libtool filename |
| 2 | |
| 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | |
| 5 | --- |
| 6 | httpd-2.4.2/build/config_vars.sh.in | 2 +- |
| 7 | httpd-2.4.2/configure | 2 +- |
| 8 | httpd-2.4.2/configure.in | 2 +- |
| 9 | httpd-2.4.2/support/apxs.in | 2 +- |
| 10 | 4 files changed, 4 insertions(+), 4 deletions(-) |
| 11 | |
| 12 | --- a/build/config_vars.sh.in |
| 13 | +++ b/build/config_vars.sh.in |
| 14 | @@ -35,7 +35,7 @@ else |
| 15 | APU_CONFIG=@APU_CONFIG@ |
| 16 | fi |
| 17 | |
| 18 | -APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`" |
| 19 | +APR_LIBTOOL="`${APR_CONFIG} --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`" |
| 20 | APR_INCLUDEDIR="`${APR_CONFIG} --includedir`" |
| 21 | test -n "@APU_CONFIG@" && APU_INCLUDEDIR="`${APU_CONFIG} --includedir`" |
| 22 | |
| 23 | --- a/configure |
| 24 | +++ b/configure |
| 25 | @@ -6205,7 +6205,7 @@ case $host in |
| 26 | if test "x$LTFLAGS" = "x"; then |
| 27 | LTFLAGS='--silent' |
| 28 | fi |
| 29 | - my_libtool=`$apr_config --apr-libtool` |
| 30 | + my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,` |
| 31 | LIBTOOL="$my_libtool \$(LTFLAGS)" |
| 32 | libtoolversion=`$my_libtool --version` |
| 33 | case $libtoolversion in |
| 34 | --- a/configure.in |
| 35 | +++ b/configure.in |
| 36 | @@ -264,7 +264,7 @@ case $host in |
| 37 | if test "x$LTFLAGS" = "x"; then |
| 38 | LTFLAGS='--silent' |
| 39 | fi |
| 40 | - my_libtool=`$apr_config --apr-libtool` |
| 41 | + my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,` |
| 42 | LIBTOOL="$my_libtool \$(LTFLAGS)" |
| 43 | libtoolversion=`$my_libtool --version` |
| 44 | case $libtoolversion in |
| 45 | --- a/support/apxs.in |
| 46 | +++ b/support/apxs.in |
| 47 | @@ -352,7 +352,7 @@ if ($apr_major_version < 2) { |
| 48 | } |
| 49 | } |
| 50 | |
| 51 | -my $libtool = `$apr_config --apr-libtool`; |
| 52 | +my $libtool = `$apr_config --apr-libtool| sed -e s,libtool,${host_alias}-libtool,`; |
| 53 | chomp($libtool); |
| 54 | |
| 55 | my $apr_includedir = `$apr_config --includes`; |