together with the recent commit in common, this little beauty should

Original commit message from CVS:
together with the recent commit in common, this little beauty should
- implement both --with-automake and --with-autoconf to autogen.sh
- pass them on to configure, along with good settings for aclocal and autoheader
- which then forces these tools to be used in rebuilding through running
make in the dirs (which was the whole point of this makeover)

Please test and let me know if it doesn't break other stuff.
Right, going to make the really minimal set of changes to all of our other
modules now.  I love having made a common/ dir ;)

We now return to your regularly scheduled broadcast.
This commit is contained in:
Thomas Vander Stichele 2002-05-27 13:37:37 +00:00
parent c887de8332
commit 2a3ae58c89
3 changed files with 10 additions and 4 deletions

View file

@ -22,6 +22,8 @@ then
fi
. common/gst-autogen.sh
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir'
autogen_options $@
echo -n "+ check for build tools"
@ -35,10 +37,10 @@ die_check $DIE
autoconf_2.52d_check || DIE=1
aclocal_check || DIE=1
autoheader_check || DIE=1
die_check $DIE
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir'
# if no arguments specified then this will be printed
if test -z "$*"; then
echo "+ checking for autogen.sh options"
@ -57,7 +59,7 @@ tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
echo "+ not running libtoolize until libtool fix has flown downstream"
# 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
echo timestamp > stamp-h.in 2> /dev/null

2
common

@ -1 +1 @@
Subproject commit 3ce22b87b251e36d30660b72b8020011246b0c64
Subproject commit 48e8bb063303c8663b9d95d35242415ad2a5ca19

View file

@ -39,9 +39,13 @@ dnl ##############################
dnl Check for tools:
dnl ================
dnl allow for different autotools
AS_AUTOTOOLS_ALTERNATE()
dnl modify 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]),
[export PKG_CONFIG_PATH=${withval}])
dnl Check for nasm