Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37655240
en ru br
Репозитории ALT
S:1.14.2-alt1
D:1.4.4-alt2.3.2
5.1: 1.6.13-alt0.M50P.1
4.1: 1.4.4-alt2.1.M41.1
4.0: 1.4.4-alt1
+updates:1.4.4-alt1
3.0: 1.2.3-alt2
www.altlinux.org/Changes

Группа :: Разработка/Прочее
Пакет: subversion

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: subversion-1.7.8-alt-custom-libtool.patch
Скачать


diff --git a/subversion/configure.ac b/subversion/configure.ac
index 3481299..a7d5d5f 100644
--- a/subversion/configure.ac
+++ b/subversion/configure.ac
@@ -215,21 +215,16 @@ AC_DEFINE_UNQUOTED(SVN_LOCALE_DIR, "${svn_localedir}",
                    [Defined to be the path to the installed locale dirs])
 
 dnl Check for libtool -- we'll definitely need it for all our shared libs!
-AC_MSG_NOTICE([configuring libtool now])
-ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
-AC_ARG_ENABLE(experimental-libtool,
-  AS_HELP_STRING([--enable-experimental-libtool],[Use APR's libtool]),
-  [experimental_libtool=$enableval],[experimental_libtool=no])
-
-if test "$experimental_libtool" = "yes"; then
-  echo "using APR's libtool"
-  sh_libtool="`$apr_config --apr-libtool`"
-  LIBTOOL="$sh_libtool"
-  SVN_LIBTOOL="$sh_libtool"
-else
-  sh_libtool="$abs_builddir/libtool"
-  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
-fi
+AC_PROG_LIBTOOL
+AC_ARG_WITH(custom-libtool,
+AS_HELP_STRING([--with-custom-libtool=PATH],
+               [Specify the command to run libtool]),
+               [ AC_MSG_NOTICE([using $withval as libtool])
+                 sh_libtool="$withval" ],
+               [ AC_MSG_NOTICE([using APR's libtool])
+                 sh_libtool="`$apr_config --apr-libtool`" ])
+LIBTOOL="$sh_libtool"
+SVN_LIBTOOL="$sh_libtool"
 AC_SUBST(SVN_LIBTOOL)
 
 dnl Determine the libtool version
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin