mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
same changes
Original commit message from CVS: same changes
This commit is contained in:
parent
031de644f9
commit
796709105d
3 changed files with 9 additions and 3 deletions
|
@ -22,6 +22,8 @@ then
|
||||||
fi
|
fi
|
||||||
. common/gst-autogen.sh
|
. common/gst-autogen.sh
|
||||||
|
|
||||||
|
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'
|
||||||
|
|
||||||
autogen_options $@
|
autogen_options $@
|
||||||
|
|
||||||
echo -n "+ check for build tools"
|
echo -n "+ check for build tools"
|
||||||
|
@ -35,10 +37,10 @@ die_check $DIE
|
||||||
|
|
||||||
autoconf_2.52d_check || DIE=1
|
autoconf_2.52d_check || DIE=1
|
||||||
aclocal_check || DIE=1
|
aclocal_check || DIE=1
|
||||||
|
autoheader_check || DIE=1
|
||||||
|
|
||||||
die_check $DIE
|
die_check $DIE
|
||||||
|
|
||||||
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'
|
|
||||||
# if no arguments specified then this will be printed
|
# if no arguments specified then this will be printed
|
||||||
if test -z "$*"; then
|
if test -z "$*"; then
|
||||||
echo "+ checking for autogen.sh options"
|
echo "+ checking for autogen.sh options"
|
||||||
|
@ -56,7 +58,7 @@ tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
|
||||||
|
|
||||||
echo "+ not running libtoolize until libtool fix has flown downstream"
|
echo "+ not running libtoolize until libtool fix has flown downstream"
|
||||||
# tool_run "libtoolize" "--copy --force"
|
# tool_run "libtoolize" "--copy --force"
|
||||||
tool_run "autoheader"
|
tool_run "$autoheader"
|
||||||
|
|
||||||
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
|
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
|
||||||
echo timestamp > stamp-h.in 2> /dev/null
|
echo timestamp > stamp-h.in 2> /dev/null
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 3ce22b87b251e36d30660b72b8020011246b0c64
|
Subproject commit 48e8bb063303c8663b9d95d35242415ad2a5ca19
|
|
@ -23,6 +23,7 @@ dnl FIXME take something else ?
|
||||||
AC_CONFIG_SRCDIR([gst/law/alaw.c])
|
AC_CONFIG_SRCDIR([gst/law/alaw.c])
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
|
AUTOMAKE="$AUTOMAKE"
|
||||||
dnl Add parameters for aclocal
|
dnl Add parameters for aclocal
|
||||||
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
|
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
|
||||||
ACLOCAL="$ACLOCAL -I m4 -I common/m4 $ACLOCAL_FLAGS"
|
ACLOCAL="$ACLOCAL -I m4 -I common/m4 $ACLOCAL_FLAGS"
|
||||||
|
@ -77,6 +78,9 @@ dnl ##############################
|
||||||
dnl Check for tools:
|
dnl Check for tools:
|
||||||
dnl ================
|
dnl ================
|
||||||
|
|
||||||
|
dnl allow for different autotools
|
||||||
|
AS_AUTOTOOLS_ALTERNATE()
|
||||||
|
|
||||||
dnl modify pkg-config path
|
dnl modify pkg-config path
|
||||||
AC_ARG_WITH(pkg-config-path,
|
AC_ARG_WITH(pkg-config-path,
|
||||||
AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]),
|
AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]),
|
||||||
|
|
Loading…
Reference in a new issue