diff options
| -rwxr-xr-x | autogen.sh | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -22,6 +22,8 @@ then fi . common/gst-autogen.sh +CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG' + 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 --enable-debug --enable-DEBUG' # if no arguments specified then this will be printed if test -z "$*"; then 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" # 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 diff --git a/common b/common -Subproject 3ce22b87b251e36d30660b72b8020011246b0c6 +Subproject 48e8bb063303c8663b9d95d35242415ad2a5ca1 diff --git a/configure.ac b/configure.ac index bf655b9f..21f26809 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ dnl FIXME take something else ? AC_CONFIG_SRCDIR([gst/law/alaw.c]) AM_CONFIG_HEADER(config.h) +AUTOMAKE="$AUTOMAKE" dnl Add parameters for aclocal dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) ACLOCAL="$ACLOCAL -I m4 -I common/m4 $ACLOCAL_FLAGS" @@ -77,6 +78,9 @@ 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]), |