1.1 --- a/libgnomevfs2-mythtv/autogen.sh Wed May 02 21:38:04 2007 +0100
1.2 +++ b/libgnomevfs2-mythtv/autogen.sh Wed May 02 22:17:03 2007 +0100
1.3 @@ -1,99 +1,20 @@
1.4 #!/bin/sh
1.5 # Run this to generate all the initial makefiles, etc.
1.6
1.7 -DIE=0
1.8 -package=libgnomevfs2-mythtv
1.9 -srcfile=configure.ac
1.10 +srcdir=`dirname $0`
1.11 +test -z "$srcdir" && srcdir=.
1.12
1.13 -# a quick cvs co if necessary to alleviate the pain - may remove this
1.14 -# when developers get a clue ;)
1.15 -if test ! -d common;
1.16 -then
1.17 - echo "+ getting common/ from cvs"
1.18 - cvs co common
1.19 -fi
1.20 +PKG_NAME="gmemcoder"
1.21
1.22 -# source helper functions
1.23 -if test ! -f common/autogen-helper.sh;
1.24 -then
1.25 - echo There is something wrong with your source tree.
1.26 - echo You are missing common/autogen-helper.sh
1.27 - exit 1
1.28 -fi
1.29 -. common/autogen-helper.sh
1.30 -
1.31 -CONFIGURE_DEF_OPT='--enable-maintainer-mode'
1.32 -
1.33 -autogen_options $*
1.34 -
1.35 -echo -n "+ check for build tools"
1.36 -if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
1.37 -version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53" \
1.38 - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 53 || DIE=1
1.39 -version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.8 automake-1.7 automake-1.6" \
1.40 - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1
1.41 -version_check "libtoolize" "$LIBTOOLIZE libtoolize" \
1.42 - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
1.43 -version_check "pkg-config" "" \
1.44 - "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
1.45 -
1.46 -die_check $DIE
1.47 -
1.48 -aclocal_check || DIE=1
1.49 -autoheader_check || DIE=1
1.50 -
1.51 -die_check $DIE
1.52 -
1.53 -# if no arguments specified then this will be printed
1.54 -if test -z "$*"; then
1.55 - echo "+ checking for autogen.sh options"
1.56 - echo " This autogen script will automatically run ./configure as:"
1.57 - echo " ./configure $CONFIGURE_DEF_OPT"
1.58 - echo " To pass any additional options, please specify them on the $0"
1.59 - echo " command line."
1.60 -fi
1.61 -
1.62 -toplevel_check $srcfile
1.63 -
1.64 -tool_run "$aclocal" "-I m4 $ACLOCAL_FLAGS"
1.65 -tool_run "$libtoolize" "--copy --force"
1.66 -tool_run "$autoheader"
1.67 -
1.68 -# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
1.69 -echo timestamp > stamp-h.in 2> /dev/null
1.70 -
1.71 -tool_run "$autoconf"
1.72 -tool_run "$automake" "-a -c"
1.73 -
1.74 -# if enable exists, add an -enable option for each of the lines in that file
1.75 -if test -f enable; then
1.76 - for a in `cat enable`; do
1.77 - CONFIGURE_FILE_OPT="--enable-$a"
1.78 - done
1.79 -fi
1.80 -
1.81 -# if disable exists, add an -disable option for each of the lines in that file
1.82 -if test -f disable; then
1.83 - for a in `cat disable`; do
1.84 - CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
1.85 - done
1.86 -fi
1.87 -
1.88 -test -n "$NOCONFIGURE" && {
1.89 - echo "+ skipping configure stage for package $package, as requested."
1.90 - echo "+ autogen.sh done."
1.91 - exit 0
1.92 +(test -f $srcdir/configure.ac) || {
1.93 + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
1.94 + echo " top-level $PKG_NAME directory"
1.95 + exit 1
1.96 }
1.97
1.98 -echo "+ running configure ... "
1.99 -test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT"
1.100 -test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
1.101 -test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
1.102 -echo
1.103 -
1.104 -./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
1.105 - echo " configure failed"
1.106 - exit 1
1.107 +which gnome-autogen.sh || {
1.108 + echo "You need to install gnome-common from the GNOME CVS"
1.109 + exit 1
1.110 }
1.111 -
1.112 -echo "Now type 'make' to compile $package."
1.113 +ACLOCAL_FLAGS=$ACLOCAL_FLAGS -I ./m4
1.114 +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
2.1 --- a/libgnomevfs2-mythtv/common/Makefile.am Wed May 02 21:38:04 2007 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,1 +0,0 @@
2.4 -EXTRA_DIST = autogen-helper.sh
3.1 --- a/libgnomevfs2-mythtv/common/autogen-helper.sh Wed May 02 21:38:04 2007 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,302 +0,0 @@
3.4 -# a silly hack that generates autoregen.sh but it's handy
3.5 -echo "#!/bin/sh" > autoregen.sh
3.6 -echo "./autogen.sh $@ \$@" >> autoregen.sh
3.7 -chmod +x autoregen.sh
3.8 -
3.9 -# helper functions for autogen.sh
3.10 -
3.11 -debug ()
3.12 -# print out a debug message if DEBUG is a defined variable
3.13 -{
3.14 - if test ! -z "$DEBUG"
3.15 - then
3.16 - echo "DEBUG: $1"
3.17 - fi
3.18 -}
3.19 -
3.20 -version_check ()
3.21 -# check the version of a package
3.22 -# first argument : package name (executable)
3.23 -# second argument : optional path where to look for it instead
3.24 -# third argument : source download url
3.25 -# rest of arguments : major, minor, micro version
3.26 -# all consecutive ones : suggestions for binaries to use
3.27 -# (if not specified in second argument)
3.28 -{
3.29 - PACKAGE=$1
3.30 - PKG_PATH=$2
3.31 - URL=$3
3.32 - MAJOR=$4
3.33 - MINOR=$5
3.34 - MICRO=$6
3.35 -
3.36 - # for backwards compatibility, we let PKG_PATH=PACKAGE when PKG_PATH null
3.37 - if test -z "$PKG_PATH"; then PKG_PATH=$PACKAGE; fi
3.38 - debug "major $MAJOR minor $MINOR micro $MICRO"
3.39 - VERSION=$MAJOR
3.40 - if test ! -z "$MINOR"; then VERSION=$VERSION.$MINOR; else MINOR=0; fi
3.41 - if test ! -z "$MICRO"; then VERSION=$VERSION.$MICRO; else MICRO=0; fi
3.42 -
3.43 - debug "major $MAJOR minor $MINOR micro $MICRO"
3.44 -
3.45 - for SUGGESTION in $PKG_PATH; do
3.46 - COMMAND="$SUGGESTION"
3.47 -
3.48 - # don't check if asked not to
3.49 - test -z "$NOCHECK" && {
3.50 - echo -n " checking for $COMMAND >= $VERSION ... "
3.51 - } || {
3.52 - # we set a var with the same name as the package, but stripped of
3.53 - # unwanted chars
3.54 - VAR=`echo $PACKAGE | sed 's/-//g'`
3.55 - debug "setting $VAR"
3.56 - eval $VAR="$COMMAND"
3.57 - return 0
3.58 - }
3.59 -
3.60 - debug "checking version with $COMMAND"
3.61 - ($COMMAND --version) < /dev/null > /dev/null 2>&1 ||
3.62 - {
3.63 - echo "not found."
3.64 - continue
3.65 - }
3.66 - # strip everything that's not a digit, then use cut to get the first field
3.67 - pkg_version=`$COMMAND --version|head -n 1|sed 's/^[^0-9]*//'|cut -d' ' -f1`
3.68 - debug "pkg_version $pkg_version"
3.69 - # remove any non-digit characters from the version numbers to permit numeric
3.70 - # comparison
3.71 - pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
3.72 - pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
3.73 - pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
3.74 - test -z "$pkg_major" && pkg_major=0
3.75 - test -z "$pkg_minor" && pkg_minor=0
3.76 - test -z "$pkg_micro" && pkg_micro=0
3.77 - debug "found major $pkg_major minor $pkg_minor micro $pkg_micro"
3.78 -
3.79 - #start checking the version
3.80 - debug "version check"
3.81 -
3.82 - # reset check
3.83 - WRONG=
3.84 -
3.85 - if [ ! "$pkg_major" -gt "$MAJOR" ]; then
3.86 - debug "major: $pkg_major <= $MAJOR"
3.87 - if [ "$pkg_major" -lt "$MAJOR" ]; then
3.88 - debug "major: $pkg_major < $MAJOR"
3.89 - WRONG=1
3.90 - elif [ ! "$pkg_minor" -gt "$MINOR" ]; then
3.91 - debug "minor: $pkg_minor <= $MINOR"
3.92 - if [ "$pkg_minor" -lt "$MINOR" ]; then
3.93 - debug "minor: $pkg_minor < $MINOR"
3.94 - WRONG=1
3.95 - elif [ "$pkg_micro" -lt "$MICRO" ]; then
3.96 - debug "micro: $pkg_micro < $MICRO"
3.97 - WRONG=1
3.98 - fi
3.99 - fi
3.100 - fi
3.101 -
3.102 - if test ! -z "$WRONG"; then
3.103 - echo "found $pkg_version, not ok !"
3.104 - continue
3.105 - else
3.106 - echo "found $pkg_version, ok."
3.107 - # we set a var with the same name as the package, but stripped of
3.108 - # unwanted chars
3.109 - VAR=`echo $PACKAGE | sed 's/-//g'`
3.110 - debug "setting $VAR"
3.111 - eval $VAR="$COMMAND"
3.112 - return 0
3.113 - fi
3.114 - done
3.115 -
3.116 - echo "not found !"
3.117 - echo "You must have $PACKAGE installed to compile $package."
3.118 - echo "Download the appropriate package for your distribution,"
3.119 - echo "or get the source tarball at $URL"
3.120 - return 1;
3.121 -}
3.122 -
3.123 -aclocal_check ()
3.124 -{
3.125 - # normally aclocal is part of automake
3.126 - # so we expect it to be in the same place as automake
3.127 - # so if a different automake is supplied, we need to adapt as well
3.128 - # so how's about replacing automake with aclocal in the set var,
3.129 - # and saving that in $aclocal ?
3.130 - # note, this will fail if the actual automake isn't called automake*
3.131 - # or if part of the path before it contains it
3.132 - if [ -z "$automake" ]; then
3.133 - echo "Error: no automake variable set !"
3.134 - return 1
3.135 - else
3.136 - aclocal=`echo $automake | sed s/automake/aclocal/`
3.137 - debug "aclocal: $aclocal"
3.138 - if [ "$aclocal" != "aclocal" ];
3.139 - then
3.140 - CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-aclocal=$aclocal"
3.141 - fi
3.142 - if [ ! -x `which $aclocal` ]; then
3.143 - echo "Error: cannot execute $aclocal !"
3.144 - return 1
3.145 - fi
3.146 - fi
3.147 -}
3.148 -
3.149 -autoheader_check ()
3.150 -{
3.151 - # same here - autoheader is part of autoconf
3.152 - # use the same voodoo
3.153 - if [ -z "$autoconf" ]; then
3.154 - echo "Error: no autoconf variable set !"
3.155 - return 1
3.156 - else
3.157 - autoheader=`echo $autoconf | sed s/autoconf/autoheader/`
3.158 - debug "autoheader: $autoheader"
3.159 - if [ "$autoheader" != "autoheader" ];
3.160 - then
3.161 - CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoheader=$autoheader"
3.162 - fi
3.163 - if [ ! -x `which $autoheader` ]; then
3.164 - echo "Error: cannot execute $autoheader !"
3.165 - return 1
3.166 - fi
3.167 - fi
3.168 -
3.169 -}
3.170 -
3.171 -autoconf_2_52d_check ()
3.172 -{
3.173 - # autoconf 2.52d has a weird issue involving a yes:no error
3.174 - # so don't allow it's use
3.175 - test -z "$NOCHECK" && {
3.176 - ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'`
3.177 - if test "$ac_version" = "2.52d"; then
3.178 - echo "autoconf 2.52d has an issue with our current build."
3.179 - echo "We don't know who's to blame however. So until we do, get a"
3.180 - echo "regular version. RPM's of a working version are on the gstreamer site."
3.181 - exit 1
3.182 - fi
3.183 - }
3.184 - return 0
3.185 -}
3.186 -
3.187 -die_check ()
3.188 -{
3.189 - # call with $DIE
3.190 - # if set to 1, we need to print something helpful then die
3.191 - DIE=$1
3.192 - if test "x$DIE" = "x1";
3.193 - then
3.194 - echo
3.195 - echo "- Please get the right tools before proceeding."
3.196 - echo "- Alternatively, if you're sure we're wrong, run with --nocheck."
3.197 - exit 1
3.198 - fi
3.199 -}
3.200 -
3.201 -autogen_options ()
3.202 -{
3.203 - if test "x$1" = "x"; then
3.204 - return 0
3.205 - fi
3.206 -
3.207 - while test "x$1" != "x" ; do
3.208 - optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
3.209 - case "$1" in
3.210 - --noconfigure)
3.211 - NOCONFIGURE=defined
3.212 - AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --noconfigure"
3.213 - echo "+ configure run disabled"
3.214 - shift
3.215 - ;;
3.216 - --nocheck)
3.217 - AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --nocheck"
3.218 - NOCHECK=defined
3.219 - echo "+ autotools version check disabled"
3.220 - shift
3.221 - ;;
3.222 - --debug)
3.223 - DEBUG=defined
3.224 - AUTOGEN_EXT_OPT="$AUTOGEN_EXT_OPT --debug"
3.225 - echo "+ debug output enabled"
3.226 - shift
3.227 - ;;
3.228 - --prefix=*)
3.229 - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$optarg"
3.230 - echo "+ passing --prefix=$optarg to configure"
3.231 - shift
3.232 - ;;
3.233 - --prefix)
3.234 - shift
3.235 - echo "DEBUG: $1"
3.236 - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$1"
3.237 - echo "+ passing --prefix=$1 to configure"
3.238 - shift
3.239 - ;;
3.240 - -h|--help)
3.241 - echo "autogen.sh (autogen options) -- (configure options)"
3.242 - echo "autogen.sh help options: "
3.243 - echo " --noconfigure don't run the configure script"
3.244 - echo " --nocheck don't do version checks"
3.245 - echo " --debug debug the autogen process"
3.246 - echo " --prefix will be passed on to configure"
3.247 - echo
3.248 - echo " --with-autoconf PATH use autoconf in PATH"
3.249 - echo " --with-automake PATH use automake in PATH"
3.250 - echo
3.251 - echo "to pass options to configure, put them as arguments after -- "
3.252 - exit 1
3.253 - ;;
3.254 - --with-automake=*)
3.255 - AUTOMAKE=$optarg
3.256 - echo "+ using alternate automake in $optarg"
3.257 - CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-automake=$AUTOMAKE"
3.258 - shift
3.259 - ;;
3.260 - --with-autoconf=*)
3.261 - AUTOCONF=$optarg
3.262 - echo "+ using alternate autoconf in $optarg"
3.263 - CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF"
3.264 - shift
3.265 - ;;
3.266 - --disable*|--enable*|--with*)
3.267 - echo "+ passing option $1 to configure"
3.268 - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1"
3.269 - shift
3.270 - ;;
3.271 - --) shift ; break ;;
3.272 - *) echo "- ignoring unknown autogen.sh argument $1"; shift ;;
3.273 - esac
3.274 - done
3.275 -
3.276 - for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done
3.277 - if test ! -z "$CONFIGURE_EXT_OPT"
3.278 - then
3.279 - echo "+ options passed to configure: $CONFIGURE_EXT_OPT"
3.280 - fi
3.281 -}
3.282 -
3.283 -toplevel_check ()
3.284 -{
3.285 - srcfile=$1
3.286 - test -f $srcfile || {
3.287 - echo "You must run this script in the top-level $package directory"
3.288 - exit 1
3.289 - }
3.290 -}
3.291 -
3.292 -
3.293 -tool_run ()
3.294 -{
3.295 - tool=$1
3.296 - options=$2
3.297 - run_if_fail=$3
3.298 - echo "+ running $tool $options..."
3.299 - $tool $options || {
3.300 - echo
3.301 - echo $tool failed
3.302 - eval $run_if_fail
3.303 - exit 1
3.304 - }
3.305 -}
4.1 --- a/libgnomevfs2-mythtv/configure.ac Wed May 02 21:38:04 2007 +0100
4.2 +++ b/libgnomevfs2-mythtv/configure.ac Wed May 02 22:17:03 2007 +0100
4.3 @@ -1,4 +1,16 @@
4.4 -AC_INIT(libgnomevfs2-mythtv, 0.1)
4.5 +dnl fill in your package name and version here
4.6 +dnl autoconf configuration files for gst-plugins-dspbin
4.7 +AC_INIT
4.8 +AC_CANONICAL_TARGET
4.9 +
4.10 +AC_CONFIG_MACRO_DIR([m4])
4.11 +dnl We disable static building for development, for time savings
4.12 +dnl this goes before AS_LIBTOOL to appease autoconf
4.13 +dnl *NOTE*: dnl this line before release, so release does static too
4.14 +AM_DISABLE_STATIC
4.15 +
4.16 +dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
4.17 +AM_MAINTAINER_MODE
4.18
4.19 dnl when going to/from release please set the nano (fourth number) right !
4.20 dnl releases only do Wall, cvs and prerelease does Werror too
4.21 @@ -6,48 +18,45 @@
4.22
4.23 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
4.24
4.25 +AM_PROG_LIBTOOL
4.26 +
4.27 AM_CONFIG_HEADER(config.h)
4.28
4.29 -AM_DISABLE_STATIC
4.30 -
4.31 -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
4.32 -AM_MAINTAINER_MODE
4.33 dnl make aclocal work in maintainer mode
4.34 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
4.35
4.36 dnl check for tools
4.37 -dnl Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
4.38 -CFLAGS="$CFLAGS "
4.39 AC_PROG_CC
4.40 -AC_PROG_CPP
4.41 -AM_PROG_CC_STDC
4.42 -AC_HEADER_STDC
4.43 -AC_PROG_LIBTOOL
4.44 -
4.45 -dnl Test if --enable-debug given
4.46 -AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[enable debugging mode])])
4.47 -if test "x$enable_debug" = "xyes" ; then
4.48 - CFLAGS="$CFLAGS -g"
4.49 -fi
4.50 -
4.51 -dnl optimisation flag
4.52 -CFLAGS="$CFLAGS -O2"
4.53 +AC_PROG_CC_STDC
4.54 +AM_PROG_AS
4.55
4.56 dnl decide on error flags
4.57 -AS_COMPILER_FLAG(-Wall, LIBGNOMEVFS2_MYTHTV_WALL="yes", LIBGNOMEVFS2_MYTHTV_WALL="no")
4.58 +AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
4.59
4.60 -if test "x$LIBGNOMEVFS2_MYTHTV_WALL" = "xyes"; then
4.61 - CFLAGS="$CFLAGS -Wall"
4.62 +if test "x$GST_WALL" = "xyes"; then
4.63 + ERROR_CFLAGS="$GST_ERROR -Wall"
4.64
4.65 - if test "x$LIBGNOMEVFS2_MYTHTV_CVS" = "xyes"; then
4.66 - AS_COMPILER_FLAG(-Werror,CFLAGS="$CFLAGS -Werror",)
4.67 - fi
4.68 + if test "x$GST_CVS" = "xyes"; then
4.69 + AS_COMPILER_FLAG(-Werror,ERROR_CFLAGS="$ERROR_CFLAGS -Werror",ERROR_CFLAGS="$ERROR_CFLAGS")
4.70 + fi
4.71 fi
4.72 -
4.73 -dnl Now check required packages
4.74
4.75 -dnl Check for pkgconfig
4.76 +AC_SUBST(ERROR_CFLAGS)
4.77 +
4.78 +dnl determine c++ compiler
4.79 +AC_PROG_CXX
4.80 +dnl determine if c++ is available on this system
4.81 +AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
4.82 +dnl determine c++ preprocessor
4.83 +AC_PROG_CXXCPP
4.84 +AC_ISC_POSIX
4.85 +
4.86 +AC_HEADER_STDC([])
4.87 +AC_C_INLINE
4.88 +
4.89 +dnl Check for pkgconfig first
4.90 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
4.91 +
4.92 dnl Give error and exit if we don't have pkgconfig
4.93 if test "x$HAVE_PKGCONFIG" = "xno"; then
4.94 AC_MSG_ERROR(you need to have pkgconfig installed !)
4.95 @@ -81,6 +90,7 @@
4.96 AC_SUBST(GOBJECT_CFLAGS)
4.97 AC_SUBST(GOBJECT_LIBS)
4.98
4.99 +
4.100 GNOME_VFS_REQS=2.7.4
4.101 PKG_CHECK_MODULES(GNOME_VFS,
4.102 gnome-vfs-2.0 >= $GNOME_VFS_REQS gnome-vfs-module-2.0 >= $GNOME_VFS_REQS,
4.103 @@ -94,23 +104,17 @@
4.104 AC_SUBST(GNOME_VFS_CFLAGS)
4.105 AC_SUBST(GNOME_VFS_LIBS)
4.106
4.107 -dnl Check for gmyth
4.108 -GMYTH_REQS=0.2
4.109 -PKG_CHECK_MODULES(LIBGMYTH,
4.110 - gmyth >= $GMYTH_REQS,
4.111 - have_libgmyth=yes,
4.112 - have_libgmyth=no)
4.113
4.114 -if test x"$have_libgmyth" = "xno"; then
4.115 - AC_MSG_ERROR(gmyth-0.1 not found)
4.116 +PKG_CHECK_MODULES(LIBGMYTH, gmyth >= 0.3, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
4.117 +if test "x$HAVE_LIBGMYTH" = "xno"; then
4.118 + AC_MSG_ERROR(you need gmyth >= 0.3 installed)
4.119 fi
4.120 -
4.121 AC_SUBST(LIBGMYTH_CFLAGS)
4.122 AC_SUBST(LIBGMYTH_LIBS)
4.123
4.124 -AC_OUTPUT([
4.125 -Makefile
4.126 -modules/Makefile
4.127 -common/Makefile
4.128 -m4/Makefile
4.129 -])
4.130 +
4.131 +AC_OUTPUT( \
4.132 + Makefile \
4.133 + modules/Makefile
4.134 +)
4.135 +
5.1 --- a/libgnomevfs2-mythtv/m4/Makefile.am Wed May 02 21:38:04 2007 +0100
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,4 +0,0 @@
5.4 -EXTRA_DIST = \
5.5 - as-compiler-flag.m4 \
5.6 - as-expand.m4 \
5.7 - as-version.m4
6.1 --- a/libgnomevfs2-mythtv/m4/as-compiler-flag.m4 Wed May 02 21:38:04 2007 +0100
6.2 +++ b/libgnomevfs2-mythtv/m4/as-compiler-flag.m4 Wed May 02 22:17:03 2007 +0100
6.3 @@ -4,7 +4,7 @@
6.4
6.5 dnl David Schleef <ds@schleef.org>
6.6
6.7 -dnl $Id: as-compiler-flag.m4,v 1.1.1.1 2005/08/26 00:42:44 andrunko Exp $
6.8 +dnl $Id: as-compiler-flag.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
6.9
6.10 dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
6.11 dnl Tries to compile with the given CFLAGS.
6.12 @@ -30,4 +30,3 @@
6.13 fi
6.14 AC_MSG_RESULT([$flag_ok])
6.15 ])
6.16 -
7.1 --- a/libgnomevfs2-mythtv/m4/as-version.m4 Wed May 02 21:38:04 2007 +0100
7.2 +++ b/libgnomevfs2-mythtv/m4/as-version.m4 Wed May 02 22:17:03 2007 +0100
7.3 @@ -1,12 +1,18 @@
7.4 -dnl version.m4 0.0.5
7.5 +dnl as-version.m4 0.1.0
7.6 +
7.7 dnl autostars m4 macro for versioning
7.8 -dnl thomas@apestaart.org
7.9 -dnl
7.10 -dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO, ACTION_IF_NO_NANO, ACTION_IF_NANO)
7.11 +
7.12 +dnl Thomas Vander Stichele <thomas at apestaart dot org>
7.13 +
7.14 +dnl $Id: as-version.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
7.15 +
7.16 +dnl AS_VERSION(PACKAGE, PREFIX, MAJOR, MINOR, MICRO, NANO,
7.17 +dnl ACTION-IF-NO-NANO, [ACTION-IF-NANO])
7.18 +
7.19 dnl example
7.20 dnl AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2,)
7.21 dnl for a 0.3.2 release version
7.22 -dnl
7.23 +
7.24 dnl this macro
7.25 dnl - defines [$PREFIX]_MAJOR, MINOR and MICRO
7.26 dnl - if NANO is empty, then we're in release mode, else in cvs/dev mode
7.27 @@ -18,15 +24,16 @@
7.28 dnl maintainer mode from running ok
7.29 dnl
7.30 dnl don't forget to put #undef [$2] and [$2]_RELEASE in acconfig.h
7.31 +dnl if you use acconfig.h
7.32
7.33 AC_DEFUN([AS_VERSION],
7.34 [
7.35 PACKAGE=[$1]
7.36 - [$2]_MAJOR_VERSION=[$3]
7.37 - [$2]_MINOR_VERSION=[$4]
7.38 - [$2]_MICRO_VERSION=[$5]
7.39 + [$2]_MAJOR=[$3]
7.40 + [$2]_MINOR=[$4]
7.41 + [$2]_MICRO=[$5]
7.42 NANO=[$6]
7.43 - [$2]_NANO_VERSION=$NANO
7.44 + [$2]_NANO=$NANO
7.45 if test "x$NANO" = "x" || test "x$NANO" = "x0";
7.46 then
7.47 AC_MSG_NOTICE(configuring [$1] for release)
7.48 @@ -37,23 +44,24 @@
7.49 else
7.50 AC_MSG_NOTICE(configuring [$1] for development with nano $NANO)
7.51 VERSION=[$3].[$4].[$5].$NANO
7.52 - [$2]_RELEASE=`date +%Y%m%d_%H%M%S`
7.53 + [$2]_RELEASE=0.`date +%Y%m%d.%H%M%S`
7.54 dnl execute action
7.55 ifelse([$8], , :, [$8])
7.56 fi
7.57
7.58 - [$2]_VERSION=$VERSION
7.59 - AC_DEFINE_UNQUOTED([$2]_VERSION, "$[$2]_VERSION", [Define the version])
7.60 - AC_SUBST([$2]_VERSION)
7.61 -
7.62 + [$2]=$VERSION
7.63 + AC_DEFINE_UNQUOTED([$2], "$[$2]", [Define the version])
7.64 + AC_SUBST([$2])
7.65 + AC_DEFINE_UNQUOTED([$2]_RELEASE, "$[$2]_RELEASE", [Define the release version])
7.66 AC_SUBST([$2]_RELEASE)
7.67
7.68 - AC_SUBST([$2]_MAJOR_VERSION)
7.69 - AC_SUBST([$2]_MINOR_VERSION)
7.70 - AC_SUBST([$2]_MICRO_VERSION)
7.71 - AC_SUBST([$2]_NANO_VERSION)
7.72 + AC_SUBST([$2]_MAJOR)
7.73 + AC_SUBST([$2]_MINOR)
7.74 + AC_SUBST([$2]_MICRO)
7.75 + AC_SUBST([$2]_NANO)
7.76 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define the package name])
7.77 AC_SUBST(PACKAGE)
7.78 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the version])
7.79 AC_SUBST(VERSION)
7.80 ])
7.81 +