[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[fluid-dev] [PATCH 1/9] Don't use the deprecated AM_INIT_AUTOMAKE two-ar
From: |
Antonio Ospite |
Subject: |
[fluid-dev] [PATCH 1/9] Don't use the deprecated AM_INIT_AUTOMAKE two-arguments form |
Date: |
Wed, 8 Oct 2014 16:08:17 +0200 |
Fix the warning below:
configure.ac:19: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms
are deprecated. For more info, see:
configure.ac:19:
http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
NOTE that AC_INIT wants parameters as literals, it does not accept shell
variables, so the use of m4_define() is necessary when defining version
numbers.
---
fluidsynth/configure.ac | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index 6067119..90e58ab 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -2,25 +2,28 @@ dnl --------------------------------------------------
dnl configure.in for FluidSynth
dnl --------------------------------------------------
-AC_INIT(src/fluidsynth.c)
-
dnl *** NOTE *** Don't forget to update library version below also
-FLUIDSYNTH_VERSION_MAJOR=1
-FLUIDSYNTH_VERSION_MINOR=1
-FLUIDSYNTH_VERSION_MICRO=6
-FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO
+m4_define([VERSION_MAJOR], 1)
+m4_define([VERSION_MINOR], 1)
+m4_define([VERSION_MICRO], 6)
+m4_define([VERSION_NUMBER], [VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO])
+
+AC_INIT([fluidsynth],[VERSION_NUMBER])
+AC_CONFIG_SRCDIR([src/fluidsynth.c])
+AM_INIT_AUTOMAKE
+
+dnl Convert to quoted string for version.h substitution
+FLUIDSYNTH_VERSION_MAJOR="VERSION_MAJOR"
+FLUIDSYNTH_VERSION_MINOR="VERSION_MINOR"
+FLUIDSYNTH_VERSION_MICRO="VERSION_MICRO"
+FLUIDSYNTH_VERSION="\"$VERSION\""
AC_SUBST(FLUIDSYNTH_VERSION_MAJOR)
AC_SUBST(FLUIDSYNTH_VERSION_MINOR)
AC_SUBST(FLUIDSYNTH_VERSION_MICRO)
AC_SUBST(FLUIDSYNTH_VERSION)
-AM_INIT_AUTOMAKE(fluidsynth, $FLUIDSYNTH_VERSION)
-
-dnl Convert to quoted string for version.h substitution
-FLUIDSYNTH_VERSION="\"$VERSION\""
-
dnl *** NOTICE ***
dnl Update library version upon each release (follow these steps in order)
dnl if any source code changes: lt_revision++
--
2.1.1
- [fluid-dev] [PATCH 0/9] autotools updates, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 7/9] Remove some autotools files which will be installed by autoreconf, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 9/9] Add a .gitignore file, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 5/9] Fix indentation in configure.ac, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 4/9] Update configure.ac as suggested by the autoupdate program, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 3/9] Define the default soundfont in configure.ac, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 8/9] Add support for automake silent rules, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 2/9] Don't use the old INCLUDES name in src/Makefile.am, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 6/9] Use autoreconf in autogen.sh instead of calling auto programs manually, Antonio Ospite, 2014/10/08
- [fluid-dev] [PATCH 1/9] Don't use the deprecated AM_INIT_AUTOMAKE two-arguments form,
Antonio Ospite <=
- Re: [fluid-dev] [PATCH 0/9] autotools updates, Antonio Ospite, 2014/10/31