fluid-dev
[Top][All Lists]
Advanced

[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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]