mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
automake 1.6 patch ;)
Original commit message from CVS: automake 1.6 patch ;)
This commit is contained in:
parent
8a39e98f8b
commit
b69342f7f2
1 changed files with 4 additions and 6 deletions
10
configure.ac
10
configure.ac
|
@ -2,7 +2,11 @@ AC_INIT
|
||||||
AC_CANONICAL_TARGET([])
|
AC_CANONICAL_TARGET([])
|
||||||
|
|
||||||
dnl when going to/from release please set the nano (fourth number) right !
|
dnl when going to/from release please set the nano (fourth number) right !
|
||||||
|
<<<<<<< configure.ac
|
||||||
|
AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2, )
|
||||||
|
=======
|
||||||
AS_VERSION(gstreamer, GST_VERSION, 0, 3, 3, 1)
|
AS_VERSION(gstreamer, GST_VERSION, 0, 3, 3, 1)
|
||||||
|
>>>>>>> 1.138
|
||||||
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
|
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
|
||||||
AS_LIBTOOL(GST, 0, 0, 0, yes)
|
AS_LIBTOOL(GST, 0, 0, 0, yes)
|
||||||
|
|
||||||
|
@ -154,12 +158,6 @@ main() { atomic_t t; atomic_set(&t,0); atomic_inc(&t); atomic_add(1,&t);return 0
|
||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl ==========================================================================
|
|
||||||
dnl ============================= gst plugins ================================
|
|
||||||
dnl ==========================================================================
|
|
||||||
GST_PLUGIN_LDFLAGS='-module -avoid-version'
|
|
||||||
AC_SUBST(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
||||||
dnl ######################################################################
|
dnl ######################################################################
|
||||||
dnl # Check command line parameters, and set shell variables accordingly #
|
dnl # Check command line parameters, and set shell variables accordingly #
|
||||||
dnl ######################################################################
|
dnl ######################################################################
|
||||||
|
|
Loading…
Reference in a new issue