shithub: opus

Info  •  Files  •  Log  •  Branches

Move the various version defines to be together.

The config.h version defines were declared in the
middle of the math feature testing. This commit moves
it to the top of configure.ac where the other version
number code resides.

--- a/configure.ac

+++ b/configure.ac

@@ -22,6 +22,21 @@

   OPUS_VERSION="$GIT_VERSION"

 fi

+# For automake.

+VERSION=$OPUS_VERSION

+PACKAGE=opus

+

+# For our version string.

+AC_SUBST(OPUS_VERSION)

+

+# For config.h

+AC_DEFINE_UNQUOTED(OPUS_VERSION, "${OPUS_VERSION}", [Complete version string])

+AC_DEFINE_UNQUOTED(OPUS_MAJOR_VERSION, ${OPUS_MAJOR_VERSION}, [Version major])

+AC_DEFINE_UNQUOTED(OPUS_MINOR_VERSION, ${OPUS_MINOR_VERSION}, [Version minor])

+AC_DEFINE_UNQUOTED(OPUS_MICRO_VERSION, ${OPUS_MICRO_VERSION}, [Version micro])

+AC_DEFINE_UNQUOTED(OPUS_EXTRA_VERSION, "${OPUS_EXTRA_VERSION}", [Version extra])

+

+# For libtool.

 LIBOPUS_SUFFIX=0

 OPUS_LT_CURRENT=0

@@ -33,13 +48,6 @@

 AC_SUBST(OPUS_LT_AGE)

 AC_SUBST(LIBOPUS_SUFFIX)

-# For automake.

-VERSION=$OPUS_VERSION

-PACKAGE=opus

-

-# For our version string

-AC_SUBST(OPUS_VERSION)

-

 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)

 AM_MAINTAINER_MODE

@@ -122,12 +130,6 @@

   AC_CHECK_LIB([m], [exp], [LIBS="-lm $LIBS"; LIBM="-lm"],[LIBM=])

 fi

 AC_SUBST([LIBM])

-

-AC_DEFINE_UNQUOTED(OPUS_VERSION, "${OPUS_VERSION}", [Complete version string])

-AC_DEFINE_UNQUOTED(OPUS_MAJOR_VERSION, ${OPUS_MAJOR_VERSION}, [Version major])

-AC_DEFINE_UNQUOTED(OPUS_MINOR_VERSION, ${OPUS_MINOR_VERSION}, [Version minor])

-AC_DEFINE_UNQUOTED(OPUS_MICRO_VERSION, ${OPUS_MICRO_VERSION}, [Version micro])

-AC_DEFINE_UNQUOTED(OPUS_EXTRA_VERSION, "${OPUS_EXTRA_VERSION}", [Version extra])

 has_float_approx=no

 #case "$host_cpu" in