Skip to content

Commit

Permalink
Merge pull request #85 from besser82/feature/lt_init
Browse files Browse the repository at this point in the history
get GNU Autotools up-to-date

Fixing warnings that would get shown with `autoreconf -vfi -Wobsolete`
  • Loading branch information
mvidner committed May 11, 2015
2 parents 171bfd6 + dc93f28 commit 00eb0d9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ Makefile.in
/config.sub
/configure
/configure.ac
/configure.ac~
/configure.in
/compile
/depcomp
/install-sh
/libtool
Expand Down
5 changes: 5 additions & 0 deletions build-tools/Makefile.am.toplevel
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions build-tools/scripts/y2autoconf
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion configure.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions package/yast2-devtools.changes
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-devtools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-devtools
Version: 3.1.31
Version: 3.1.32
Release: 0
Url: http://github.com/yast/yast-devtools

Expand Down

0 comments on commit 00eb0d9

Please sign in to comment.