Start to add gstreamer things. Just init for now.

Add --enable-debug flag to configure

diff --git a/Makefile.in b/Makefile.in
index f257be18a3149c18d812e92e36e8a64d04995e27..9bb9e497cb771d2a8b5c5f50e09e873049460293 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HILDON_CFLAGS = @HILDON_CFLAGS@

diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index baf42ed4f4a949ddb4d2eb1fa1955dd3db6f6f7e..9a42184993aa7cabb9d3550cb573fb2bcdebd93f 100644 (file)
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIB@&t@OBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIB@&t@OBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1028,6 +1028,14 @@ ac_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
 ac_env_SQLITE_LIBS_value=$SQLITE_LIBS
 ac_cv_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
 ac_cv_env_SQLITE_LIBS_value=$SQLITE_LIBS
+ac_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
+ac_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
+ac_cv_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
+ac_cv_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
+ac_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
+ac_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
+ac_cv_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
+ac_cv_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
 
 #
 # Report the --help message.
@@ -1116,6 +1124,7 @@ Optional Features:
   --enable-fast-install@<:@=PKGS@:>@ 
                           optimize for fast installation @<:@default=yes@:>@
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-debug                compile with DEBUG
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1172,6 +1181,10 @@ Some influential environment variables:
   SQLITE_CFLAGS 
               C compiler flags for SQLITE, overriding pkg-config
   SQLITE_LIBS linker flags for SQLITE, overriding pkg-config
+  GSTREAMER_CFLAGS 
+              C compiler flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_LIBS 
+              linker flags for GSTREAMER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -18658,6 +18671,23 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
        
        
 
+
+DEBUG_FLAGS=
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+  
+else
+  enable_debug=no
+fi; 
+
+if test "x$enable_debug" = "xyes"; then
+    DEBUG_FLAGS="$DEBUG_FLAGS -DDEBUG -g -fno-omit-frame-pointer"
+else
+    DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+fi
+
+CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall -std=c99 -Wmissing-prototypes -Wmissing-declarations"
 
 
 
@@ -20003,6 +20033,120 @@ fi
 
 
 
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for GSTREAMER" >&5
+echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_CFLAGS"; then
+        pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_LIBS"; then
+        pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10"`
+        else 
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GSTREAMER_PKG_ERRORS" >&5
+
+       { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (gstreamer-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+       { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+       GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+       GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       :
+fi
+
+
+
 # Localisation
 if test "x$HAVE_HILDON" = "xyes"; then
  localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
@@ -22897,6 +23041,8 @@ s,@LIBCURL_CFLAGS@,$LIBCURL_CFLAGS,;t t
 s,@LIBCURL_LIBS@,$LIBCURL_LIBS,;t t
 s,@SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
 s,@SQLITE_LIBS@,$SQLITE_LIBS,;t t
+s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t
+s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t
 s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
 s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
 s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t

diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 196ea8276d6de391daa89b948de4c4f2b9292adb..5e5245f91fec02bbaf56e11a618c14dd0919b52d 100644 (file)
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -17,19 +17,19 @@
                       {
                         'm4_pattern_forbid' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_TYPE_OFF_T' => 1,
                         'AC_C_VOLATILE' => 1,
+                        'AC_TYPE_OFF_T' => 1,
                         'AC_FUNC_CLOSEDIR_VOID' => 1,
                         'AC_REPLACE_FNMATCH' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_FUNC_STAT' => 1,
-                        'AC_HEADER_TIME' => 1,
                         'AC_FUNC_WAIT3' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_STRUCT_TM' => 1,
+                        'AC_HEADER_TIME' => 1,
                         'AC_FUNC_LSTAT' => 1,
-                        'AC_TYPE_MODE_T' => 1,
+                        'AC_STRUCT_TM' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         'AC_FUNC_GETMNTENT' => 1,
+                        'AC_TYPE_MODE_T' => 1,
                         'AC_FUNC_STRTOD' => 1,
                         'AC_CHECK_HEADERS' => 1,
                         'AC_FUNC_STRNLEN' => 1,
@@ -48,17 +48,17 @@
                         'AC_STRUCT_ST_BLOCKS' => 1,
                         'AC_TYPE_SIGNAL' => 1,
                         'AC_TYPE_UID_T' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
                         'AC_PROG_MAKE_SET' => 1,
-                        'sinclude' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'm4_pattern_allow' => 1,
+                        'sinclude' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AC_FUNC_STRERROR_R' => 1,
                         'AC_PROG_CC' => 1,
-                        'AC_FUNC_FORK' => 1,
                         'AC_DECL_SYS_SIGLIST' => 1,
-                        'AC_FUNC_VPRINTF' => 1,
+                        'AC_FUNC_FORK' => 1,
                         'AC_FUNC_STRCOLL' => 1,
+                        'AC_FUNC_VPRINTF' => 1,
                         'AC_PROG_YACC' => 1,
                         'AC_INIT' => 1,
                         'AC_STRUCT_TIMEZONE' => 1,
@@ -80,34 +80,34 @@
                         'AM_MAINTAINER_MODE' => 1,
                         'AC_FUNC_UTIME_NULL' => 1,
                         'AC_FUNC_SELECT_ARGTYPES' => 1,
-                        'AC_FUNC_STRFTIME' => 1,
                         'AC_HEADER_STAT' => 1,
-                        'AC_C_INLINE' => 1,
+                        'AC_FUNC_STRFTIME' => 1,
                         'AC_PROG_CPP' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_TYPE_PID_T' => 1,
-                        'AC_C_CONST' => 1,
+                        'AC_C_INLINE' => 1,
                         'AC_PROG_LEX' => 1,
+                        'AC_C_CONST' => 1,
+                        'AC_TYPE_PID_T' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
                         'AC_CONFIG_FILES' => 1,
                         'include' => 1,
                         'AC_FUNC_SETVBUF_REVERSED' => 1,
                         'AC_PROG_INSTALL' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AC_FUNC_OBSTACK' => 1,
                         'AC_CHECK_LIB' => 1,
+                        'AC_FUNC_OBSTACK' => 1,
                         'AC_FUNC_MALLOC' => 1,
                         'AC_FUNC_GETGROUPS' => 1,
                         'AC_FUNC_GETLOADAVG' => 1,
                         'AH_OUTPUT' => 1,
                         'AC_FUNC_FSEEKO' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
                         'AC_FUNC_MKTIME' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_HEADER_SYS_WAIT' => 1,
-                        'AC_FUNC_MEMCMP' => 1,
                         'AC_PROG_LN_S' => 1,
+                        'AC_FUNC_MEMCMP' => 1,
                         'm4_include' => 1,
                         'AC_HEADER_DIRENT' => 1,
                         'AC_CHECK_FUNCS' => 1

diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index dddea8c1abbec1ad6053654ffa1452e89db78def..225645946befb0c56d2c21b3eabccf8394e11513 100644 (file)
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -381,117 +381,121 @@ configure.ac:27: _AC_PROG_LIBTOOL is required by...
 aclocal.m4:853: AC_PROG_LIBTOOL is expanded from...
 configure.ac:27: the top level])
 m4trace:configure.ac:27: -1- AC_SUBST([LIBTOOL])
-m4trace:configure.ac:29: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:29: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-m4trace:configure.ac:29: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:29: -1- AC_SUBST([PKG_CONFIG], [$ac_cv_path_PKG_CONFIG])
-m4trace:configure.ac:29: -1- AC_SUBST([ac_pt_PKG_CONFIG], [$ac_cv_path_ac_pt_PKG_CONFIG])
-m4trace:configure.ac:29: -1- AC_SUBST([GTK_CFLAGS])
-m4trace:configure.ac:29: -1- AC_SUBST([GTK_LIBS])
-m4trace:configure.ac:30: -1- AC_SUBST([GTK_LIBS])
-m4trace:configure.ac:31: -1- AC_SUBST([GTK_CFLAGS])
-m4trace:configure.ac:34: -1- AC_SUBST([HILDON_CFLAGS])
-m4trace:configure.ac:34: -1- AC_SUBST([HILDON_LIBS])
-m4trace:configure.ac:37: -1- AC_DEFINE_TRACE_LITERAL([WITH_HILDON])
-m4trace:configure.ac:37: -1- AH_OUTPUT([WITH_HILDON], [/* build with Maemo/Hildon user interface */
-#undef WITH_HILDON])
-m4trace:configure.ac:42: -1- AM_CONDITIONAL([WITH_HILDON], [test "x$HAVE_HILDON" = "xyes"])
-m4trace:configure.ac:42: -1- AC_SUBST([WITH_HILDON_TRUE])
-m4trace:configure.ac:42: -1- AC_SUBST([WITH_HILDON_FALSE])
+m4trace:configure.ac:41: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:41: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4trace:configure.ac:41: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:41: -1- AC_SUBST([PKG_CONFIG], [$ac_cv_path_PKG_CONFIG])
+m4trace:configure.ac:41: -1- AC_SUBST([ac_pt_PKG_CONFIG], [$ac_cv_path_ac_pt_PKG_CONFIG])
+m4trace:configure.ac:41: -1- AC_SUBST([GTK_CFLAGS])
+m4trace:configure.ac:41: -1- AC_SUBST([GTK_LIBS])
+m4trace:configure.ac:42: -1- AC_SUBST([GTK_LIBS])
+m4trace:configure.ac:43: -1- AC_SUBST([GTK_CFLAGS])
 m4trace:configure.ac:46: -1- AC_SUBST([HILDON_CFLAGS])
-m4trace:configure.ac:47: -1- AC_SUBST([HILDON_LIBS])
-m4trace:configure.ac:49: -1- AC_SUBST([OSSO_CFLAGS])
-m4trace:configure.ac:49: -1- AC_SUBST([OSSO_LIBS])
-m4trace:configure.ac:50: -1- AC_SUBST([OSSO_LIBS])
-m4trace:configure.ac:51: -1- AC_SUBST([OSSO_CFLAGS])
-m4trace:configure.ac:53: -1- AC_SUBST([HILDON_CFLAGS])
-m4trace:configure.ac:53: -1- AC_SUBST([HILDON_LIBS])
-m4trace:configure.ac:54: -1- AC_SUBST([HILDON_LIBS])
-m4trace:configure.ac:55: -1- AC_SUBST([HILDON_CFLAGS])
-m4trace:configure.ac:57: -1- AC_SUBST([BLUEZ_CFLAGS])
-m4trace:configure.ac:57: -1- AC_SUBST([BLUEZ_LIBS])
-m4trace:configure.ac:58: -1- AC_SUBST([BLUEZ_LIBS])
-m4trace:configure.ac:59: -1- AC_SUBST([BLUEZ_CFLAGS])
-m4trace:configure.ac:62: -1- AC_SUBST([GNOME_VFS_CFLAGS])
-m4trace:configure.ac:62: -1- AC_SUBST([GNOME_VFS_LIBS])
-m4trace:configure.ac:63: -1- AC_SUBST([GNOME_VFS_LIBS])
-m4trace:configure.ac:64: -1- AC_SUBST([GNOME_VFS_CFLAGS])
-m4trace:configure.ac:66: -1- AC_SUBST([GCONF_CFLAGS])
-m4trace:configure.ac:66: -1- AC_SUBST([GCONF_LIBS])
-m4trace:configure.ac:67: -1- AC_SUBST([GCONF_LIBS])
-m4trace:configure.ac:68: -1- AC_SUBST([GCONF_CFLAGS])
-m4trace:configure.ac:70: -1- AC_SUBST([LIBXML2_CFLAGS])
-m4trace:configure.ac:70: -1- AC_SUBST([LIBXML2_LIBS])
-m4trace:configure.ac:71: -1- AC_SUBST([LIBXML2_LIBS])
-m4trace:configure.ac:72: -1- AC_SUBST([LIBXML2_CFLAGS])
-m4trace:configure.ac:74: -1- AC_SUBST([DBUS_GLIB_CFLAGS])
-m4trace:configure.ac:74: -1- AC_SUBST([DBUS_GLIB_LIBS])
-m4trace:configure.ac:75: -1- AC_SUBST([DBUS_GLIB_LIBS])
-m4trace:configure.ac:76: -1- AC_SUBST([DBUS_GLIB_CFLAGS])
-m4trace:configure.ac:78: -1- AC_SUBST([LIBCURL_CFLAGS])
-m4trace:configure.ac:78: -1- AC_SUBST([LIBCURL_LIBS])
-m4trace:configure.ac:79: -1- AC_SUBST([LIBCURL_LIBS])
-m4trace:configure.ac:80: -1- AC_SUBST([LIBCURL_CFLAGS])
-m4trace:configure.ac:82: -1- AC_SUBST([SQLITE_CFLAGS])
-m4trace:configure.ac:82: -1- AC_SUBST([SQLITE_LIBS])
-m4trace:configure.ac:83: -1- AC_SUBST([SQLITE_LIBS])
-m4trace:configure.ac:84: -1- AC_SUBST([SQLITE_CFLAGS])
-m4trace:configure.ac:92: -1- _m4_warn([obsolete], [The macro `AC_PROG_INTLTOOL' is obsolete.
+m4trace:configure.ac:46: -1- AC_SUBST([HILDON_LIBS])
+m4trace:configure.ac:49: -1- AC_DEFINE_TRACE_LITERAL([WITH_HILDON])
+m4trace:configure.ac:49: -1- AH_OUTPUT([WITH_HILDON], [/* build with Maemo/Hildon user interface */
+#undef WITH_HILDON])
+m4trace:configure.ac:54: -1- AM_CONDITIONAL([WITH_HILDON], [test "x$HAVE_HILDON" = "xyes"])
+m4trace:configure.ac:54: -1- AC_SUBST([WITH_HILDON_TRUE])
+m4trace:configure.ac:54: -1- AC_SUBST([WITH_HILDON_FALSE])
+m4trace:configure.ac:58: -1- AC_SUBST([HILDON_CFLAGS])
+m4trace:configure.ac:59: -1- AC_SUBST([HILDON_LIBS])
+m4trace:configure.ac:61: -1- AC_SUBST([OSSO_CFLAGS])
+m4trace:configure.ac:61: -1- AC_SUBST([OSSO_LIBS])
+m4trace:configure.ac:62: -1- AC_SUBST([OSSO_LIBS])
+m4trace:configure.ac:63: -1- AC_SUBST([OSSO_CFLAGS])
+m4trace:configure.ac:65: -1- AC_SUBST([HILDON_CFLAGS])
+m4trace:configure.ac:65: -1- AC_SUBST([HILDON_LIBS])
+m4trace:configure.ac:66: -1- AC_SUBST([HILDON_LIBS])
+m4trace:configure.ac:67: -1- AC_SUBST([HILDON_CFLAGS])
+m4trace:configure.ac:69: -1- AC_SUBST([BLUEZ_CFLAGS])
+m4trace:configure.ac:69: -1- AC_SUBST([BLUEZ_LIBS])
+m4trace:configure.ac:70: -1- AC_SUBST([BLUEZ_LIBS])
+m4trace:configure.ac:71: -1- AC_SUBST([BLUEZ_CFLAGS])
+m4trace:configure.ac:74: -1- AC_SUBST([GNOME_VFS_CFLAGS])
+m4trace:configure.ac:74: -1- AC_SUBST([GNOME_VFS_LIBS])
+m4trace:configure.ac:75: -1- AC_SUBST([GNOME_VFS_LIBS])
+m4trace:configure.ac:76: -1- AC_SUBST([GNOME_VFS_CFLAGS])
+m4trace:configure.ac:78: -1- AC_SUBST([GCONF_CFLAGS])
+m4trace:configure.ac:78: -1- AC_SUBST([GCONF_LIBS])
+m4trace:configure.ac:79: -1- AC_SUBST([GCONF_LIBS])
+m4trace:configure.ac:80: -1- AC_SUBST([GCONF_CFLAGS])
+m4trace:configure.ac:82: -1- AC_SUBST([LIBXML2_CFLAGS])
+m4trace:configure.ac:82: -1- AC_SUBST([LIBXML2_LIBS])
+m4trace:configure.ac:83: -1- AC_SUBST([LIBXML2_LIBS])
+m4trace:configure.ac:84: -1- AC_SUBST([LIBXML2_CFLAGS])
+m4trace:configure.ac:86: -1- AC_SUBST([DBUS_GLIB_CFLAGS])
+m4trace:configure.ac:86: -1- AC_SUBST([DBUS_GLIB_LIBS])
+m4trace:configure.ac:87: -1- AC_SUBST([DBUS_GLIB_LIBS])
+m4trace:configure.ac:88: -1- AC_SUBST([DBUS_GLIB_CFLAGS])
+m4trace:configure.ac:90: -1- AC_SUBST([LIBCURL_CFLAGS])
+m4trace:configure.ac:90: -1- AC_SUBST([LIBCURL_LIBS])
+m4trace:configure.ac:91: -1- AC_SUBST([LIBCURL_LIBS])
+m4trace:configure.ac:92: -1- AC_SUBST([LIBCURL_CFLAGS])
+m4trace:configure.ac:94: -1- AC_SUBST([SQLITE_CFLAGS])
+m4trace:configure.ac:94: -1- AC_SUBST([SQLITE_LIBS])
+m4trace:configure.ac:95: -1- AC_SUBST([SQLITE_LIBS])
+m4trace:configure.ac:96: -1- AC_SUBST([SQLITE_CFLAGS])
+m4trace:configure.ac:98: -1- AC_SUBST([GSTREAMER_CFLAGS])
+m4trace:configure.ac:98: -1- AC_SUBST([GSTREAMER_LIBS])
+m4trace:configure.ac:99: -1- AC_SUBST([GSTREAMER_LIBS])
+m4trace:configure.ac:100: -1- AC_SUBST([GSTREAMER_CFLAGS])
+m4trace:configure.ac:108: -1- _m4_warn([obsolete], [The macro `AC_PROG_INTLTOOL' is obsolete.
 You should run autoupdate.], [aclocal.m4:7574: AC_PROG_INTLTOOL is expanded from...
-configure.ac:92: the top level])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_DESKTOP_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_DIRECTORY_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_KEYS_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_PROP_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_OAF_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_PONG_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_SERVER_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_SHEET_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_SOUNDLIST_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_UI_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_XAM_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_KBD_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_XML_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_XML_NOMERGE_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_CAVES_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_SCHEMAS_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_THEME_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_SERVICE_RULE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_EXTRACT], ['$(top_builddir)/intltool-extract'])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_MERGE], ['$(top_builddir)/intltool-merge'])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_UPDATE], ['$(top_builddir)/intltool-update'])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_PERL], [$ac_cv_path_INTLTOOL_PERL])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_ICONV], [$ac_cv_path_INTLTOOL_ICONV])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_MSGFMT], [$ac_cv_path_INTLTOOL_MSGFMT])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_MSGMERGE], [$ac_cv_path_INTLTOOL_MSGMERGE])
-m4trace:configure.ac:92: -1- AC_SUBST([INTLTOOL_XGETTEXT], [$ac_cv_path_INTLTOOL_XGETTEXT])
-m4trace:configure.ac:92: -1- AC_SUBST([ALL_LINGUAS])
-m4trace:configure.ac:92: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:108: the top level])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_DESKTOP_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_DIRECTORY_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_KEYS_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PROP_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_OAF_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PONG_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SERVER_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SHEET_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SOUNDLIST_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_UI_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XAM_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_KBD_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XML_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XML_NOMERGE_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_CAVES_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SCHEMAS_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_THEME_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SERVICE_RULE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_EXTRACT], ['$(top_builddir)/intltool-extract'])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MERGE], ['$(top_builddir)/intltool-merge'])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_UPDATE], ['$(top_builddir)/intltool-update'])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PERL], [$ac_cv_path_INTLTOOL_PERL])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_ICONV], [$ac_cv_path_INTLTOOL_ICONV])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MSGFMT], [$ac_cv_path_INTLTOOL_MSGFMT])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MSGMERGE], [$ac_cv_path_INTLTOOL_MSGMERGE])
+m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XGETTEXT], [$ac_cv_path_INTLTOOL_XGETTEXT])
+m4trace:configure.ac:108: -1- AC_SUBST([ALL_LINGUAS])
+m4trace:configure.ac:108: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 aclocal.m4:7377: IT_PROG_INTLTOOL is expanded from...
 aclocal.m4:7574: AC_PROG_INTLTOOL is expanded from...
-configure.ac:92: the top level])
-m4trace:configure.ac:92: -1- AC_SUBST([DATADIRNAME])
-m4trace:configure.ac:94: -1- AC_SUBST([GETTEXT_PACKAGE])
-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE])
-m4trace:configure.ac:95: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* Name of gettext package */
+configure.ac:108: the top level])
+m4trace:configure.ac:108: -1- AC_SUBST([DATADIRNAME])
+m4trace:configure.ac:110: -1- AC_SUBST([GETTEXT_PACKAGE])
+m4trace:configure.ac:111: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE])
+m4trace:configure.ac:111: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* Name of gettext package */
 #undef GETTEXT_PACKAGE])
-m4trace:configure.ac:97: -1- AC_CHECK_HEADERS([locale.h])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+m4trace:configure.ac:113: -1- AC_CHECK_HEADERS([locale.h])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H])
-m4trace:configure.ac:97: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
 autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
 aclocal.m4:7626: GLIB_LC_MESSAGES is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES])
-m4trace:configure.ac:97: -1- AC_SUBST([USE_NLS])
-m4trace:configure.ac:97: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:113: -1- AC_SUBST([USE_NLS])
+m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
 autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
@@ -499,8 +503,8 @@ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 aclocal.m4:7680: GLIB_WITH_NLS is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
 autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
@@ -508,96 +512,96 @@ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 aclocal.m4:7680: GLIB_WITH_NLS is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET])
-m4trace:configure.ac:97: -1- AC_CHECK_LIB([intl], [bindtextdomain], [AC_CHECK_LIB(intl, ngettext,
+m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [bindtextdomain], [AC_CHECK_LIB(intl, ngettext,
                    [AC_CHECK_LIB(intl, dgettext,
                                  gt_cv_func_dgettext_libintl=yes)])])
-m4trace:configure.ac:97: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dgettext,
+m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dgettext,
                                  gt_cv_func_dgettext_libintl=yes)])
-m4trace:configure.ac:97: -1- AC_CHECK_LIB([intl], [dgettext], [gt_cv_func_dgettext_libintl=yes])
-m4trace:configure.ac:97: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dcgettext,
+m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [dgettext], [gt_cv_func_dgettext_libintl=yes])
+m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dcgettext,
                       [gt_cv_func_dgettext_libintl=yes
                        libintl_extra_libs=-liconv],
                        :,-liconv)], [:], [-liconv])
-m4trace:configure.ac:97: -1- AC_CHECK_LIB([intl], [dcgettext], [gt_cv_func_dgettext_libintl=yes
+m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [dcgettext], [gt_cv_func_dgettext_libintl=yes
                        libintl_extra_libs=-liconv], [:], [-liconv])
-m4trace:configure.ac:97: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
+m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
+m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT])
-m4trace:configure.ac:97: -1- AC_SUBST([MSGFMT])
-m4trace:configure.ac:97: -1- AC_CHECK_FUNCS([dcgettext])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */
+m4trace:configure.ac:113: -1- AC_SUBST([MSGFMT])
+m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([dcgettext])
+m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */
 #undef HAVE_DCGETTEXT])
-m4trace:configure.ac:97: -1- AC_SUBST([MSGFMT_OPTS])
-m4trace:configure.ac:97: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT])
-m4trace:configure.ac:97: -1- AC_SUBST([XGETTEXT])
-m4trace:configure.ac:97: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:113: -1- AC_SUBST([MSGFMT_OPTS])
+m4trace:configure.ac:113: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT])
+m4trace:configure.ac:113: -1- AC_SUBST([XGETTEXT])
+m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 aclocal.m4:7680: GLIB_WITH_NLS is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
-m4trace:configure.ac:97: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
+m4trace:configure.ac:113: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS])
-m4trace:configure.ac:97: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
+m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
 You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
 aclocal.m4:7680: GLIB_WITH_NLS is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
 You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from...
 autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
 aclocal.m4:7680: GLIB_WITH_NLS is expanded from...
 aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from...
 aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from...
-configure.ac:97: the top level])
-m4trace:configure.ac:97: -1- AC_SUBST([CATALOGS])
-m4trace:configure.ac:97: -1- AC_SUBST([CATOBJEXT])
-m4trace:configure.ac:97: -1- AC_SUBST([DATADIRNAME])
-m4trace:configure.ac:97: -1- AC_SUBST([GMOFILES])
-m4trace:configure.ac:97: -1- AC_SUBST([INSTOBJEXT])
-m4trace:configure.ac:97: -1- AC_SUBST([INTLLIBS])
-m4trace:configure.ac:97: -1- AC_SUBST([PO_IN_DATADIR_TRUE])
-m4trace:configure.ac:97: -1- AC_SUBST([PO_IN_DATADIR_FALSE])
-m4trace:configure.ac:97: -1- AC_SUBST([POFILES])
-m4trace:configure.ac:97: -1- AC_SUBST([POSUB])
-m4trace:configure.ac:97: -1- AC_SUBST([MKINSTALLDIRS])
-m4trace:configure.ac:135: -1- AC_SUBST([helpfile_enusdir])
-m4trace:configure.ac:137: -1- AC_SUBST([helpfile_engbdir])
-m4trace:configure.ac:140: -1- AC_SUBST([desktopentrydir])
-m4trace:configure.ac:141: -1- AC_SUBST([serviceentrydir])
-m4trace:configure.ac:142: -1- AC_SUBST([localedir])
-m4trace:configure.ac:143: -1- AC_SUBST([pixmapdir])
-m4trace:configure.ac:144: -1- AC_SUBST([icon_26x26dir])
-m4trace:configure.ac:145: -1- AC_SUBST([icon_34x34dir])
-m4trace:configure.ac:146: -1- AC_SUBST([icon_40x40dir])
-m4trace:configure.ac:147: -1- AC_SUBST([icon_50x50dir])
-m4trace:configure.ac:148: -1- AC_SUBST([icon_scalabledir])
-m4trace:configure.ac:149: -1- AC_SUBST([pluginlibdir])
-m4trace:configure.ac:150: -1- AC_SUBST([plugindesktopentrydir])
-m4trace:configure.ac:152: -1- AC_DEFINE_TRACE_LITERAL([LOCALEDIR])
-m4trace:configure.ac:152: -1- AH_OUTPUT([LOCALEDIR], [/* Runtime locale catalog files path */
+configure.ac:113: the top level])
+m4trace:configure.ac:113: -1- AC_SUBST([CATALOGS])
+m4trace:configure.ac:113: -1- AC_SUBST([CATOBJEXT])
+m4trace:configure.ac:113: -1- AC_SUBST([DATADIRNAME])
+m4trace:configure.ac:113: -1- AC_SUBST([GMOFILES])
+m4trace:configure.ac:113: -1- AC_SUBST([INSTOBJEXT])
+m4trace:configure.ac:113: -1- AC_SUBST([INTLLIBS])
+m4trace:configure.ac:113: -1- AC_SUBST([PO_IN_DATADIR_TRUE])
+m4trace:configure.ac:113: -1- AC_SUBST([PO_IN_DATADIR_FALSE])
+m4trace:configure.ac:113: -1- AC_SUBST([POFILES])
+m4trace:configure.ac:113: -1- AC_SUBST([POSUB])
+m4trace:configure.ac:113: -1- AC_SUBST([MKINSTALLDIRS])
+m4trace:configure.ac:151: -1- AC_SUBST([helpfile_enusdir])
+m4trace:configure.ac:153: -1- AC_SUBST([helpfile_engbdir])
+m4trace:configure.ac:156: -1- AC_SUBST([desktopentrydir])
+m4trace:configure.ac:157: -1- AC_SUBST([serviceentrydir])
+m4trace:configure.ac:158: -1- AC_SUBST([localedir])
+m4trace:configure.ac:159: -1- AC_SUBST([pixmapdir])
+m4trace:configure.ac:160: -1- AC_SUBST([icon_26x26dir])
+m4trace:configure.ac:161: -1- AC_SUBST([icon_34x34dir])
+m4trace:configure.ac:162: -1- AC_SUBST([icon_40x40dir])
+m4trace:configure.ac:163: -1- AC_SUBST([icon_50x50dir])
+m4trace:configure.ac:164: -1- AC_SUBST([icon_scalabledir])
+m4trace:configure.ac:165: -1- AC_SUBST([pluginlibdir])
+m4trace:configure.ac:166: -1- AC_SUBST([plugindesktopentrydir])
+m4trace:configure.ac:168: -1- AC_DEFINE_TRACE_LITERAL([LOCALEDIR])
+m4trace:configure.ac:168: -1- AH_OUTPUT([LOCALEDIR], [/* Runtime locale catalog files path */
 #undef LOCALEDIR])
-m4trace:configure.ac:153: -1- AC_DEFINE_TRACE_LITERAL([PIXMAPDIR])
-m4trace:configure.ac:153: -1- AH_OUTPUT([PIXMAPDIR], [/* Runtime pixmap files path */
+m4trace:configure.ac:169: -1- AC_DEFINE_TRACE_LITERAL([PIXMAPDIR])
+m4trace:configure.ac:169: -1- AH_OUTPUT([PIXMAPDIR], [/* Runtime pixmap files path */
 #undef PIXMAPDIR])
-m4trace:configure.ac:156: -1- AC_CONFIG_FILES([Makefile \
+m4trace:configure.ac:172: -1- AC_CONFIG_FILES([Makefile \
           src/Makefile \
           data/Makefile \
           data/help/Makefile \
           po/Makefile.in \
           po/Makefile
 ])
-m4trace:configure.ac:156: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:156: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:156: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:172: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:172: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])

diff --git a/configure b/configure
index 317b5db384930920e4d8a355b4c4f335cd63b16c..6ab220f4d4c6f1b6b9e5915c9c30cfa88e32af42 100755 (executable)
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1028,6 +1028,14 @@ ac_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
 ac_env_SQLITE_LIBS_value=$SQLITE_LIBS
 ac_cv_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
 ac_cv_env_SQLITE_LIBS_value=$SQLITE_LIBS
+ac_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
+ac_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
+ac_cv_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
+ac_cv_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
+ac_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
+ac_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
+ac_cv_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
+ac_cv_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
 
 #
 # Report the --help message.
@@ -1116,6 +1124,7 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-debug                compile with DEBUG
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1172,6 +1181,10 @@ Some influential environment variables:
   SQLITE_CFLAGS
               C compiler flags for SQLITE, overriding pkg-config
   SQLITE_LIBS linker flags for SQLITE, overriding pkg-config
+  GSTREAMER_CFLAGS
+              C compiler flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_LIBS
+              linker flags for GSTREAMER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -4045,7 +4058,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4048 "configure"' > conftest.$ac_ext
+  echo '#line 4061 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5403,7 +5416,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5406:" \
+echo "$as_me:5419:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6466,11 +6479,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6469: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6473: \$? = $ac_status" >&5
+   echo "$as_me:6486: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6734,11 +6747,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6737: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6750: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6741: \$? = $ac_status" >&5
+   echo "$as_me:6754: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6838,11 +6851,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6841: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6854: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6845: \$? = $ac_status" >&5
+   echo "$as_me:6858: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9183,7 +9196,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9186 "configure"
+#line 9199 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9283,7 +9296,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9286 "configure"
+#line 9299 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11626,11 +11639,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11629: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11642: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11633: \$? = $ac_status" >&5
+   echo "$as_me:11646: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11730,11 +11743,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11733: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11746: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11737: \$? = $ac_status" >&5
+   echo "$as_me:11750: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13303,11 +13316,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13306: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13319: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13310: \$? = $ac_status" >&5
+   echo "$as_me:13323: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13407,11 +13420,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13410: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13423: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13414: \$? = $ac_status" >&5
+   echo "$as_me:13427: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15613,11 +15626,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15616: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15629: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15620: \$? = $ac_status" >&5
+   echo "$as_me:15633: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15881,11 +15894,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15884: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15897: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15888: \$? = $ac_status" >&5
+   echo "$as_me:15901: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15985,11 +15998,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15988: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16001: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15992: \$? = $ac_status" >&5
+   echo "$as_me:16005: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18658,6 +18671,23 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+DEBUG_FLAGS=
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+
+else
+  enable_debug=no
+fi;
+
+if test "x$enable_debug" = "xyes"; then
+    DEBUG_FLAGS="$DEBUG_FLAGS -DDEBUG -g -fno-omit-frame-pointer"
+else
+    DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+fi
+
+CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall -std=c99 -Wmissing-prototypes -Wmissing-declarations"
 
 
 
@@ -20003,6 +20033,120 @@ fi
 
 
 
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for GSTREAMER" >&5
+echo $ECHO_N "checking for GSTREAMER... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_CFLAGS"; then
+        pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GSTREAMER_LIBS"; then
+        pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10"`
+        else
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GSTREAMER_PKG_ERRORS" >&5
+
+       { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (gstreamer-0.10) were not met:
+
+$GSTREAMER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+       { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+and GSTREAMER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+       GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+       GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       :
+fi
+
+
+
 # Localisation
 if test "x$HAVE_HILDON" = "xyes"; then
  localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
@@ -22897,6 +23041,8 @@ s,@LIBCURL_CFLAGS@,$LIBCURL_CFLAGS,;t t
 s,@LIBCURL_LIBS@,$LIBCURL_LIBS,;t t
 s,@SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
 s,@SQLITE_LIBS@,$SQLITE_LIBS,;t t
+s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t
+s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t
 s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
 s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
 s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t

diff --git a/configure.ac b/configure.ac
index a8b894e5bb26788e76e5c90c74359a743b46c48c..1ef8d039d4118a5bf324f29f12b340f74ec6f420 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,18 @@ AC_CONFIG_HEADERS(src/config.h)
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
+dnl Debugging options to enable debug macros
+DEBUG_FLAGS=
+AC_ARG_ENABLE(debug,     [  --enable-debug                compile with DEBUG],,enable_debug=no)
+
+if test "x$enable_debug" = "xyes"; then
+    DEBUG_FLAGS="$DEBUG_FLAGS -DDEBUG -g -fno-omit-frame-pointer"
+else
+    DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+fi
+
+CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall -std=c99 -Wmissing-prototypes -Wmissing-declarations"
+
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
@@ -83,6 +95,10 @@ PKG_CHECK_MODULES(SQLITE, sqlite3)
 AC_SUBST(SQLITE_LIBS)
 AC_SUBST(SQLITE_CFLAGS)
 
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)
+AC_SUBST(GSTREAMER_LIBS)
+AC_SUBST(GSTREAMER_CFLAGS)
+
 # Localisation
 if test "x$HAVE_HILDON" = "xyes"; then
  localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`

diff --git a/data/Makefile.in b/data/Makefile.in
index 64ec785297b816a2047bb4b02b81b8f88e33909d..e16dee1c1e198c95327a86928c513e0c9610613c 100644 (file)
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -100,6 +100,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HILDON_CFLAGS = @HILDON_CFLAGS@

diff --git a/data/help/Makefile.in b/data/help/Makefile.in
index 3752f65a7b5d16980ad1ded4a4d048b8c69dfdcf..6037d808702bdedbd87e1c1843645eeae2319013 100644 (file)
--- a/data/help/Makefile.in
+++ b/data/help/Makefile.in
@@ -100,6 +100,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HILDON_CFLAGS = @HILDON_CFLAGS@

diff --git a/src/Makefile.am b/src/Makefile.am
index 284b43311421c0eeb7b3ff53db1aa777c9b1a408..4a24c7bf3661570a65223c3618479f00aa956c99 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,11 +21,11 @@
 bin_PROGRAMS = mapper
 
 mapper_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) \
-       $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) \
+       $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) $(DBUS_GLIB_CFLAGS) $(BLUEZ_CFLAGS)
 
 mapper_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) \
-       $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) \
+       $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) $(GSTREAMER_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS)
 
 mapper_SOURCES = utils.c \

diff --git a/src/Makefile.in b/src/Makefile.in
index e49a9e06818ffe5a1b19ee972ebe955051f4a3cd..a7e619f5c87b8dc0a1f8bb1b31b4441915d78e1f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -100,6 +100,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HILDON_CFLAGS = @HILDON_CFLAGS@
@@ -234,12 +236,12 @@ target_alias = @target_alias@
 bin_PROGRAMS = mapper
 
 mapper_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) \
-       $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) \
+       $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) $(DBUS_GLIB_CFLAGS) $(BLUEZ_CFLAGS)
 
 
 mapper_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) \
-       $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) \
+       $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) $(GSTREAMER_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS)
 
 

diff --git a/src/mapper.c b/src/mapper.c
index 9a4b7ac61b9108448cac6c7145143242e223f78c..4f60cb67b15e2dfa6dbe9eea0167fce987578599 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <glib/gstdio.h>
+#include <gst/gst.h>
 #include <gtk/gtk.h>
 #include <fcntl.h>
 #include <gdk/gdkkeysyms.h>
@@ -253,7 +254,8 @@ gint main(gint argc, gchar * argv[])
 #endif
 
        set_var_defaults();
-
+       
+       gst_init(&argc, &argv);
        gtk_init(&argc, &argv);
 
        /* Init gconf. */