From af8ab01d906ba7b0579d0e0de68102bd197ae9ee Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 21 Jan 2013 16:06:40 +0000 Subject: [PATCH] configure.ac: Move AS_LIBTOOL() and SCXI_SO_VERSION Move the call to AS_LIBTOOL() to avoid warnings from automake 1.12.6. Move SCXI_SO_VERSION as it is nearby! On Gentoo Linux: $ WANT_AUTOMAKE=1.12 ./autogen.sh configure.ac:101: warning: LT_INIT was called before AM_PROG_AR /usr/share/aclocal-1.12/ar-lib.m4:13: AM_PROG_AR is expanded from... configure.ac:101: the top level configure.ac:101: warning: AC_PROG_LIBTOOL was called before AM_PROG_AR /usr/share/aclocal-1.12/ar-lib.m4:13: AM_PROG_AR is expanded from... configure.ac:101: the top level configure.ac:101: warning: LT_INIT was called before AM_PROG_AR aclocal.m4:8669: AM_PROG_AR is expanded from... configure.ac:101: the top level configure.ac:101: warning: AC_PROG_LIBTOOL was called before AM_PROG_AR aclocal.m4:8669: AM_PROG_AR is expanded from... configure.ac:101: the top level --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 979d130..6247067 100644 --- a/configure.ac +++ b/configure.ac @@ -87,11 +87,6 @@ AC_CONFIG_AUX_DIR([.]) COMEDILIB_DEBUG="-Wall" AM_INIT_AUTOMAKE([-Wall -Werror]) -# AS_LIBTOOL arguments are (prefix, current, revision, age) -AS_LIBTOOL(COMEDILIB, comedilib_lt_current, comedilib_lt_revision, comedilib_lt_age) -SCXI_SO_VERSION=scxi_lt_current:scxi_lt_revision:scxi_lt_age -AC_SUBST(SCXI_SO_VERSION) - AM_CONFIG_HEADER(config.h) ACLOCAL="$ACLOCAL -I m4" @@ -111,6 +106,11 @@ AC_HEADER_STDC([]) AX_TLS +# AS_LIBTOOL arguments are (prefix, current, revision, age) +AS_LIBTOOL(COMEDILIB, comedilib_lt_current, comedilib_lt_revision, comedilib_lt_age) +SCXI_SO_VERSION=scxi_lt_current:scxi_lt_revision:scxi_lt_age +AC_SUBST(SCXI_SO_VERSION) + COMEDILIB_CFLAGS="$COMEDILIB_CFLAGS -I\$(top_srcdir)/include -I\$(top_builddir)/include $COMEDILIB_DEBUG" COMEDILIB_LIBS="$COMEDILIB_LIBS \$(top_builddir)/lib/libcomedi.la -lm" AC_SUBST(COMEDILIB_CFLAGS) -- 2.26.2