From: Thomas V. S. <tho...@pd...> - 2004-06-21 09:52:21
|
CVS Root: /cvs/gstreamer Module: gst-python Changes by: thomasvs Date: Mon Jun 21 2004 02:52:15 PDT Log message: sync with other modules Modified files: . : autogen.sh configure.ac Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/autogen.sh.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/configure.ac.diff?r1=1.43&r2=1.44 ====Begin Diffs==== Index: autogen.sh =================================================================== RCS file: /cvs/gstreamer/gst-python/autogen.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- autogen.sh 4 Mar 2004 11:32:46 -0000 1.6 +++ autogen.sh 21 Jun 2004 09:52:03 -0000 1.7 @@ -4,49 +4,50 @@ DIE=0 package=gst-python srcfile=gst/gstmodule.c - + # a quick cvs co if necessary to alleviate the pain - may remove this # when developers get a clue ;) -if test ! -d common; -then +if test ! -d common; +then echo "+ getting common/ from cvs" - cvs co common + cvs co common fi +# ensure that we have the dirs we put ext libs in to appease automake +mkdir -p gst-libs/ext/ffmpeg/ffmpeg # source helper functions -if test ! -e common/gst-autogen.sh; +if test ! -f common/gst-autogen.sh; then echo There is something wrong with your source tree. echo You are missing common/gst-autogen.sh exit 1 - . common/gst-autogen.sh -CONFIGURE_DEF_OPT='--enable-maintainer-mode' +CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG' autogen_options $@ echo -n "+ check for build tools" -if test ! -z $NOCHECK; then echo " skipped"; else echo; fi -version_check "autoconf" "$AUTOCONF autoconf autoconf-2.53 autoconf-2.52" \ +if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi +version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 -version_check "automake" "$AUTOMAKE automake automake-1.6 automake-1.5" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 -version_check "libtool" "" \ - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 +version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \ + "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1 +version_check "libtoolize" "$LIBTOOLIZE libtoolize" \ + "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 die_check $DIE -autoconf_2_52d_check || DIE=1 +autoconf_2_52d_check || DIE=1 aclocal_check || DIE=1 autoheader_check || DIE=1 # if no arguments specified then this will be printed if test -z "$*"; then echo "+ checking for autogen.sh options" @@ -55,39 +56,32 @@ echo " To pass any additional options, please specify them on the $0" echo " command line." -toplevel_check $srcfile -if test -z "$ACLOCAL_FLAGS"; then - acdir=`$aclocal --print-ac-dir` - m4list="glib-2.0.m4 gtk-2.0.m4" - for file in $m4list - do - if [ ! -f "$acdir/$file" ]; then - echo "WARNING: aclocal's directory is $acdir, but..." - echo " no file $acdir/$file" - echo " You may see fatal macro warnings below." - echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS " - echo " environment variable to \"-I /some/dir\", or install" - echo " $acdir/$file." - echo "" - fi - done -fi +toplevel_check $srcfile tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS" -tool_run "libtoolize" "--copy --force" +tool_run "$libtoolize" "--copy --force" 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 tool_run "$autoconf" +tool_run "$automake" "-a -c" -case $CC in -*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; -esac -tool_run "$automake" "-a -c $am_opt" +# if enable exists, add an -enable option for each of the lines in that file +if test -f enable; then + for a in `cat enable`; do + CONFIGURE_FILE_OPT="--enable-$a" + done +fi +# if disable exists, add an -disable option for each of the lines in that file +if test -f disable; then + for a in `cat disable`; do + CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a" test -n "$NOCONFIGURE" && { echo "+ skipping configure stage for package $package, as requested." @@ -98,11 +92,12 @@ echo "+ running configure ... " test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT" test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT" +test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT" echo -./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || { +./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || { echo " configure failed" exit 1 } echo "Now type 'make' to compile $package." Index: configure.ac RCS file: /cvs/gstreamer/gst-python/configure.ac,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- configure.ac 3 May 2004 10:56:08 -0000 1.43 +++ configure.ac 21 Jun 2004 09:52:03 -0000 1.44 @@ -4,16 +4,17 @@ AC_INIT AC_CANONICAL_TARGET -m4_define(pygst_major_version, 0) -m4_define(pygst_minor_version, 7) -m4_define(pygst_micro_version, 91) -m4_define(pygst_version, pygst_major_version.pygst_minor_version.pygst_micro_version) +dnl AM_MAINTAINER_MODE only provides the option to configure to enable it +AM_MAINTAINER_MODE + +dnl when going to/from release please set the nano (fourth number) right ! +AS_VERSION(gst-python, PYGST_VERSION, 0, 7, 92, 1, GST_CVS="no", GST_CVS="yes") -AM_INIT_AUTOMAKE(gst-python, pygst_version) +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_DEFINE(PYGST_MAJOR_VERSION, pygst_major_version, [PyGst major version]) -AC_DEFINE(PYGST_MINOR_VERSION, pygst_minor_version, [PyGst minor version]) -AC_DEFINE(PYGST_MICRO_VERSION, pygst_micro_version, [PyGst macro version]) +AC_DEFINE_UNQUOTED(PYGST_MAJOR_VERSION, $PYGST_VERSION_MAJOR, [PyGst major version]) +AC_DEFINE_UNQUOTED(PYGST_MINOR_VERSION, $PYGST_VERSION_MINOR, [PyGst minor version]) +AC_DEFINE_UNQUOTED(PYGST_MICRO_VERSION, $PYGST_VERSION_MICRO, [PyGst macro version]) AC_CONFIG_SRCDIR([gst/gstmodule.c]) AM_CONFIG_HEADER(config.h) |