replace obsolete A[CM]_PROG_LIBTOOL with LT_INIT()

yast · May 9, 2015 · 015df9c · 015df9c
1 parent 55faf82
commit 015df9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/build-tools/Makefile.am.toplevel b/build-tools/Makefile.am.toplevel
@@ -72,6 +72,11 @@ endif
 EXTRA_DIST += $(RPMNAME).pc.in
 endif
 
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
+
 pot:
 	$(Y2TOOL) y2makepot -s $(srcdir)
 

diff --git a/build-tools/scripts/y2autoconf b/build-tools/scripts/y2autoconf
@@ -281,9 +281,9 @@ CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
 : ${AGENT_LIBADD:=\'-L$(libdir) -lscr -ly2util -lycpvalues\'}
 AC_SUBST(AGENT_LIBADD)
 
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL dnl for libraries
+dnl for libraries
+LT_INIT([disable-static])
+AC_SUBST([LIBTOOL_DEPS])
 
 dnl generate the config header
 AC_CONFIG_HEADERS([config.h]) dnl at the distribution this done

diff --git a/configure.in.in b/configure.in.in
@@ -18,8 +18,9 @@ CREATE_PKGCONFIG=noarch
 # don't take all the garbage of YaST2-CHECKS-PROGRAM
 # this is anyway necessary only because autoreconf
 # gets confused by Makefile.am in skeletons
-AC_PROG_LIBTOOL
 AC_PROG_CXX
+LT_INIT([disable-static])
+AC_SUBST([LIBTOOL_DEPS])
 
 # perl checks
 AC_CHECK_PROG(PERL, perl, perl, no)