diff --git a/.gitignore b/.gitignore index bd797de5..d6214018 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,9 @@ Makefile.in /config.sub /configure /configure.ac +/configure.ac~ /configure.in +/compile /depcomp /install-sh /libtool diff --git a/build-tools/Makefile.am.toplevel b/build-tools/Makefile.am.toplevel index be3b5264..4afc869c 100644 --- 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 index 4218d4cf..14c2459b 100755 --- a/build-tools/scripts/y2autoconf +++ b/build-tools/scripts/y2autoconf @@ -87,7 +87,7 @@ $OUTPUT = join ("\n", map { "$_/Makefile" } @SUBDIRS); # init: common stuff '@YAST2-INIT-COMMON@' => -"AC_INIT($RPMNAME, $VERSION, http://bugs.opensuse.org/, $RPMNAME) +"AC_INIT([$RPMNAME],[$VERSION],[http://bugs.opensuse.org/],[$RPMNAME]) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -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 index 38e401b8..8e6881b5 100644 --- 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) diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes index 20f8bd87..759482c8 100644 --- a/package/yast2-devtools.changes +++ b/package/yast2-devtools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 09 13:14:55 CEST 2015 - besser82@fedoraproject.org + +- replace obsolete `AC_PROG_LIBTOOL` with `LT_INIT()` +- use new `AC_INIT()`-syntax with args in square braces +- 3.1.32 + ------------------------------------------------------------------- Wed May 06 16:24:52 CEST 2015 - aschnell@suse.de diff --git a/package/yast2-devtools.spec b/package/yast2-devtools.spec index 37108cee..31942555 100644 --- a/package/yast2-devtools.spec +++ b/package/yast2-devtools.spec @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.31 +Version: 3.1.32 Release: 0 Url: http://github.com/yast/yast-devtools