Skip to content

Commit

Permalink
Merge branch 'release/v0.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelgruner committed Jul 9, 2020
2 parents c41a05c + 3b3b834 commit 7d1c3d4
Show file tree
Hide file tree
Showing 12 changed files with 297 additions and 299 deletions.
16 changes: 15 additions & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ olddir=`pwd`
cd "$srcdir"

package=gst-shark
srcfile=gst-shark.doap.in
srcfile=configure.ac

# Make sure we have common
if test ! -f common/gst-autogen.sh;
Expand Down Expand Up @@ -55,12 +55,26 @@ if test -z "$NOCHECK"; then
exit 1
}

printf " checking for automake ... "
echo
which "automake" 2>/dev/null || {
echo "not found! Please install the automake package."
exit 1
}

printf " checking for pkg-config ... "
echo
which "pkg-config" 2>/dev/null || {
echo "not found! Please install pkg-config."
exit 1
}

printf " checking for libtool ... "
echo
which "libtool" 2>/dev/null || which "libtoolize" 2>/dev/null || {
echo "not found! Please install libtool."
exit 1
}
else
echo ": skipped version checks"
fi
Expand Down
7 changes: 1 addition & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, git and prerelease does Werror too
dnl
AC_INIT([GstShark],
[0.6.1.1],
[0.7.0.1],
[https://github.com/RidgeRun/gst-shark],
[gst-shark],
[https://github.com/RidgeRun/gst-shark])
Expand Down Expand Up @@ -98,10 +98,6 @@ AG_GST_ARG_EXAMPLES
AG_GST_ARG_WITH_PKG_CONFIG_PATH
AG_GST_PKG_CONFIG_PATH

AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
["${srcdir}/gst-shark.doap"],
[$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])

dnl build static plugins or not
AC_MSG_CHECKING([whether to build static plugins or not])
AC_ARG_ENABLE(
Expand Down Expand Up @@ -418,7 +414,6 @@ AC_SUBST(GST_SHARK_PLUGIN_LDFLAGS, "$GST_SHARK_PLUGIN_LDFLAGS")

dnl Finally output everything
AC_CONFIG_FILES([
gst-shark.doap
Makefile
plugins/Makefile
plugins/tracers/Makefile
Expand Down
205 changes: 0 additions & 205 deletions gst-shark.doap.in

This file was deleted.

Loading

0 comments on commit 7d1c3d4

Please sign in to comment.