summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac28
1 files changed, 15 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index b5cedb4b..bf132a24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,21 @@ else
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_REVISION)
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
@@ -123,12 +131,6 @@ if test x"$fp_libm_not_needed" = xdunno; then
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
#i[[3456]]86 | x86_64 | powerpc64 | powerpc32 | ia64)