diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-09-11 12:36:52 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2012-09-11 12:36:58 -0400 |
| commit | 129176598afd1d760ef5d7864276fc681d40abfd (patch) | |
| tree | b0c9683d5f412daa4fe7f97b4953880d67fe553b /configure.ac | |
| parent | d58ba0017be71c37ef4b5a36109c3dd68cc423c3 (diff) | |
| download | farstream-129176598afd1d760ef5d7864276fc681d40abfd.tar.gz | |
Replace FS_MAJORMINOR with FS_APIVERSION
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 8fd484f5..9ae054df 100644 --- a/configure.ac +++ b/configure.ac @@ -35,16 +35,14 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], AC_SUBST(AM_DEFAULT_VERBOSITY)]) dnl our libraries and install dirs use major.minor as a version -#FS_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR -#FS_MAJOR_MINOR=$PACKAGE_VERSION_MAJOR\_$PACKAGE_VERSION_MINOR -FS_MAJORMINOR=0.2 -FS_MAJOR_MINOR=0_2 -AC_SUBST(FS_MAJORMINOR) -AC_SUBST(FS_MAJOR_MINOR) -AC_DEFINE_UNQUOTED(FS_MAJORMINOR, "$FS_MAJORMINOR", - [Farstream major.minor version]) -AC_DEFINE_UNQUOTED(FS_MAJOR_MINOR, "$FS_MAJORMINOR", - [Farstream major_minor version]) +FS_APIVERSION=0.2 +FS_API_VERSION=0_2 +AC_SUBST(FS_APIVERSION) +AC_SUBST(FS_API_VERSION) +AC_DEFINE_UNQUOTED(FS_APIVERSION, "$FS_APIVERSION", + [Farstream x.y API version]) +AC_DEFINE_UNQUOTED(FS_API_VERSION, "$FS_APIVERSION", + [Farstream x_y API version]) GST_API_VERSION=1.0 AC_SUBST(GST_API_VERSION) @@ -179,7 +177,7 @@ AC_SUBST(NICE_LIBS) AC_SUBST(FS_TRANSMITTER_PLUGINS_SELECTED) dnl set the plugindir where plugins should be installed -AS_AC_EXPAND(FS_PLUGIN_PATH, ${libdir}/farstream-$FS_MAJORMINOR) +AS_AC_EXPAND(FS_PLUGIN_PATH, ${libdir}/farstream-$FS_APIVERSION) AC_SUBST(FS_PLUGIN_PATH) AC_DEFINE_UNQUOTED(FS_PLUGIN_PATH, "${FS_PLUGIN_PATH}", [The path were plugins are installed and search by default]) @@ -263,7 +261,7 @@ AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") dnl Check for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -FS_PREFIX="`$PKG_CONFIG --variable=prefix farstream-$FS_MAJORMINOR`" +FS_PREFIX="`$PKG_CONFIG --variable=prefix farstream-$FS_APIVERSION`" AC_SUBST(GLIB_PREFIX) AC_SUBST(FS_PREFIX) |