1.1 --- a/libgnomevfs2-mythtv/configure.ac	Wed Mar 07 14:08:55 2007 +0000
     1.2 +++ b/libgnomevfs2-mythtv/configure.ac	Thu May 03 16:05:04 2007 +0100
     1.3 @@ -1,4 +1,16 @@
     1.4 -AC_INIT(libgnomevfs2-mythtv, 0.1)
     1.5 +dnl fill in your package name and version here
     1.6 +dnl autoconf configuration files for gst-plugins-dspbin
     1.7 +AC_INIT
     1.8 +AC_CANONICAL_TARGET
     1.9 +
    1.10 +AC_CONFIG_MACRO_DIR([m4])
    1.11 +dnl We disable static building for development, for time savings
    1.12 +dnl this goes before AS_LIBTOOL to appease autoconf
    1.13 +dnl *NOTE*: dnl this line before release, so release does static too
    1.14 +AM_DISABLE_STATIC
    1.15 +
    1.16 +dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
    1.17 +AM_MAINTAINER_MODE
    1.18  
    1.19  dnl when going to/from release please set the nano (fourth number) right !
    1.20  dnl releases only do Wall, cvs and prerelease does Werror too
    1.21 @@ -6,48 +18,45 @@
    1.22  
    1.23  AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
    1.24  
    1.25 +AM_PROG_LIBTOOL
    1.26 +
    1.27  AM_CONFIG_HEADER(config.h)
    1.28  
    1.29 -AM_DISABLE_STATIC
    1.30 -
    1.31 -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
    1.32 -AM_MAINTAINER_MODE
    1.33  dnl make aclocal work in maintainer mode
    1.34  AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
    1.35  
    1.36  dnl check for tools
    1.37 -dnl Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
    1.38 -CFLAGS="$CFLAGS "
    1.39  AC_PROG_CC
    1.40 -AC_PROG_CPP
    1.41 -AM_PROG_CC_STDC
    1.42 -AC_HEADER_STDC
    1.43 -AC_PROG_LIBTOOL
    1.44 -
    1.45 -dnl Test if --enable-debug given
    1.46 -AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[enable debugging mode])])
    1.47 -if test "x$enable_debug" = "xyes" ; then
    1.48 -      CFLAGS="$CFLAGS -g"
    1.49 -fi          
    1.50 -
    1.51 -dnl optimisation flag
    1.52 -CFLAGS="$CFLAGS -O2"
    1.53 +AC_PROG_CC_STDC
    1.54 +AM_PROG_AS
    1.55  
    1.56  dnl decide on error flags
    1.57 -AS_COMPILER_FLAG(-Wall, LIBGNOMEVFS2_MYTHTV_WALL="yes", LIBGNOMEVFS2_MYTHTV_WALL="no")
    1.58 +AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
    1.59  
    1.60 -if test "x$LIBGNOMEVFS2_MYTHTV_WALL" = "xyes"; then
    1.61 -    CFLAGS="$CFLAGS -Wall"
    1.62 +if test "x$GST_WALL" = "xyes"; then
    1.63 +  ERROR_CFLAGS="$GST_ERROR -Wall"
    1.64  
    1.65 -    if test "x$LIBGNOMEVFS2_MYTHTV_CVS" = "xyes"; then
    1.66 -       AS_COMPILER_FLAG(-Werror,CFLAGS="$CFLAGS -Werror",)
    1.67 -    fi
    1.68 +  if test "x$GST_CVS" = "xyes"; then
    1.69 +    AS_COMPILER_FLAG(-Werror,ERROR_CFLAGS="$ERROR_CFLAGS -Werror",ERROR_CFLAGS="$ERROR_CFLAGS")
    1.70 +  fi
    1.71  fi
    1.72 -                  
    1.73 -dnl Now check required packages
    1.74  
    1.75 -dnl Check for pkgconfig
    1.76 +AC_SUBST(ERROR_CFLAGS)
    1.77 +
    1.78 +dnl determine c++ compiler
    1.79 +AC_PROG_CXX
    1.80 +dnl determine if c++ is available on this system
    1.81 +AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
    1.82 +dnl determine c++ preprocessor
    1.83 +AC_PROG_CXXCPP
    1.84 +AC_ISC_POSIX
    1.85 +
    1.86 +AC_HEADER_STDC([])
    1.87 +AC_C_INLINE
    1.88 +
    1.89 +dnl Check for pkgconfig first
    1.90  AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
    1.91 +
    1.92  dnl Give error and exit if we don't have pkgconfig
    1.93  if test "x$HAVE_PKGCONFIG" = "xno"; then
    1.94    AC_MSG_ERROR(you need to have pkgconfig installed !)
    1.95 @@ -81,6 +90,7 @@
    1.96  AC_SUBST(GOBJECT_CFLAGS)
    1.97  AC_SUBST(GOBJECT_LIBS)
    1.98  
    1.99 +
   1.100  GNOME_VFS_REQS=2.7.4
   1.101  PKG_CHECK_MODULES(GNOME_VFS, 
   1.102    gnome-vfs-2.0 >= $GNOME_VFS_REQS gnome-vfs-module-2.0 >= $GNOME_VFS_REQS,
   1.103 @@ -94,23 +104,17 @@
   1.104  AC_SUBST(GNOME_VFS_CFLAGS)
   1.105  AC_SUBST(GNOME_VFS_LIBS)
   1.106  
   1.107 -dnl Check for gmyth
   1.108 -GMYTH_REQS=0.2
   1.109 -PKG_CHECK_MODULES(LIBGMYTH,
   1.110 -  gmyth >= $GMYTH_REQS,
   1.111 -  have_libgmyth=yes,
   1.112 -  have_libgmyth=no)
   1.113  
   1.114 -if test x"$have_libgmyth" = "xno"; then
   1.115 -  AC_MSG_ERROR(gmyth-0.1 not found)        
   1.116 +PKG_CHECK_MODULES(LIBGMYTH, gmyth >= 0.3, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no)
   1.117 +if test "x$HAVE_LIBGMYTH" = "xno"; then
   1.118 +  AC_MSG_ERROR(you need gmyth >= 0.3 installed)
   1.119  fi
   1.120 -
   1.121  AC_SUBST(LIBGMYTH_CFLAGS)
   1.122  AC_SUBST(LIBGMYTH_LIBS)
   1.123  
   1.124 -AC_OUTPUT([
   1.125 -Makefile
   1.126 -modules/Makefile
   1.127 -common/Makefile
   1.128 -m4/Makefile
   1.129 -])
   1.130 +
   1.131 +AC_OUTPUT( \
   1.132 +    Makefile \
   1.133 +    modules/Makefile
   1.134 +)
   1.135 +