rpms/totem/OLPC-2 totem-2.18.2-plugin-build.patch, 1.2, 1.3 totem.spec, 1.113, 1.114

Marco Pesenti Gritti (mpg) fedora-extras-commits at redhat.com
Fri Nov 2 17:16:40 UTC 2007 

Author: mpg

Update of /cvs/extras/rpms/totem/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14542

Modified Files:
	totem-2.18.2-plugin-build.patch totem.spec 
Log Message:
Build with autogen.sh


totem-2.18.2-plugin-build.patch:

Index: totem-2.18.2-plugin-build.patch
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem-2.18.2-plugin-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- totem-2.18.2-plugin-build.patch	31 Oct 2007 15:41:37 -0000	1.2
+++ totem-2.18.2-plugin-build.patch	2 Nov 2007 17:14:39 -0000	1.3
@@ -1,860 +1,21 @@
---- totem-2.18.2/configure	2007-10-31 16:31:09.000000000 +0100
-+++ totem-2.18.2-new/configure	2007-10-31 16:30:31.000000000 +0100
-@@ -858,6 +858,7 @@
- host_os
- USE_NLS
- MSGFMT
-+MSGFMT_OPTS
- GMSGFMT
- XGETTEXT
- CATALOGS
-@@ -899,13 +900,13 @@
- INTLTOOL_XGETTEXT
- ALL_LINGUAS
- PKG_CONFIG
--GDU_MODULE_VERSION_CHECK_CFLAGS
--GDU_MODULE_VERSION_CHECK_LIBS
- HELP_DIR
- OMF_DIR
- DOC_USER_FORMATS
- ENABLE_SK_TRUE
- ENABLE_SK_FALSE
-+HAVE_GNOME_DOC_UTILS_TRUE
-+HAVE_GNOME_DOC_UTILS_FALSE
- CXX
- CXXFLAGS
- ac_ct_CXX
-@@ -962,6 +963,7 @@
- MOZILLA_XPT_LINK
- MOZILLA_PREFIX
- MOZILLA_LIBDIR
-+MOZILLA_LIBS
- MOZILLA_XPCOM_CFLAGS
- MOZILLA_INCLUDE_ROOT
- MOZILLA_PLUGINDIR
-@@ -1032,8 +1034,6 @@
- CPPFLAGS
- CPP
- PKG_CONFIG
--GDU_MODULE_VERSION_CHECK_CFLAGS
--GDU_MODULE_VERSION_CHECK_LIBS
- CXX
- CXXFLAGS
- CCC
-@@ -1729,11 +1729,6 @@
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   PKG_CONFIG  path to pkg-config utility
--  GDU_MODULE_VERSION_CHECK_CFLAGS
--              C compiler flags for GDU_MODULE_VERSION_CHECK, overriding
--              pkg-config
--  GDU_MODULE_VERSION_CHECK_LIBS
--              linker flags for GDU_MODULE_VERSION_CHECK, overriding pkg-config
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CXXCPP      C++ preprocessor
-@@ -5693,6 +5688,35 @@
- fi
- done
- 
-+	  MSGFMT_OPTS=
-+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
-+	  cat >conftest.foo <<_ACEOF
-+
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+_ACEOF
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+echo "$as_me: failed input was:" >&5
-+sed 's/^/| /' conftest.foo >&5
-+fi
-+
- 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -6328,6 +6352,149 @@
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
- 
- 
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+extern int _nl_msg_cat_cntr;
-+                 return _nl_msg_cat_cntr
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  DATADIRNAME=share
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	case $host in
-+    *-*-solaris*)
-+                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
-+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char bind_textdomain_codeset (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef bind_textdomain_codeset
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char bind_textdomain_codeset ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return bind_textdomain_codeset ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_func_bind_textdomain_codeset=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_bind_textdomain_codeset=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-+if test $ac_cv_func_bind_textdomain_codeset = yes; then
-+  DATADIRNAME=share
-+else
-+  DATADIRNAME=lib
-+fi
-+
-+    ;;
-+    *)
-+    DATADIRNAME=lib
-+    ;;
-+    esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+
- 
- 
- 
-@@ -6457,126 +6624,29 @@
- 
- fi
- 
--if test "x$PACKAGE" != "xgnome-doc-utils"; then
--  GDU_REQUIRED_VERSION=0.3.2
--  if test -n ""; then
--    GDU_REQUIRED_VERSION=
--  fi
--
--
--pkg_failed=no
--{ echo "$as_me:$LINENO: checking for GDU_MODULE_VERSION_CHECK" >&5
--echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6; }
-+gdu_cv_version_required=0.3.2
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then
--        pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then
--        pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
-+if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
-+  gdu_cv_have_gdu=yes
- else
--	pkg_failed=untried
-+  gdu_cv_have_gdu=no
- fi
- 
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+	:
- else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
--        else
--	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5
--
--	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
--
--$GDU_MODULE_VERSION_CHECK_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 GDU_MODULE_VERSION_CHECK_CFLAGS
--and GDU_MODULE_VERSION_CHECK_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 (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
--
--$GDU_MODULE_VERSION_CHECK_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 GDU_MODULE_VERSION_CHECK_CFLAGS
--and GDU_MODULE_VERSION_CHECK_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 GDU_MODULE_VERSION_CHECK_CFLAGS
--and GDU_MODULE_VERSION_CHECK_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 GDU_MODULE_VERSION_CHECK_CFLAGS
--and GDU_MODULE_VERSION_CHECK_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;}
-+	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-    { (exit 1); exit 1; }; }
--else
--	GDU_MODULE_VERSION_CHECK_CFLAGS=$pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS
--	GDU_MODULE_VERSION_CHECK_LIBS=$pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	:
--fi
- fi
- 
- 
-+
- # Check whether --with-help-dir was given.
- if test "${with_help_dir+set}" = set; then
-   withval=$with_help_dir;
-@@ -6616,7 +6686,7 @@
-   enable_scrollkeeper=yes
- fi
- 
-- if test "x$enable_scrollkeeper" = "xyes"; then
-+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-   ENABLE_SK_TRUE=
-   ENABLE_SK_FALSE='#'
- else
-@@ -6625,6 +6695,15 @@
- fi
- 
+--- totem-2.18.2/browser-plugin/totemPlugin.h	2007-03-26 02:50:03.000000000 +0200
++++ totem-2.18.2-new/browser-plugin/totemPlugin.h	2007-10-31 16:30:31.000000000 +0100
+@@ -33,6 +33,9 @@
+ #include "totemStringGlue.h"
+ #endif
  
-+ if test "$gdu_cv_have_gdu" = "yes"; then
-+  HAVE_GNOME_DOC_UTILS_TRUE=
-+  HAVE_GNOME_DOC_UTILS_FALSE='#'
-+else
-+  HAVE_GNOME_DOC_UTILS_TRUE='#'
-+  HAVE_GNOME_DOC_UTILS_FALSE=
-+fi
-+
++#define NS_STATIC_CAST(__type, __ptr) static_cast< __type >(__ptr)
++#define NS_REINTERPRET_CAST(__type, __expr) reinterpret_cast< __type >(__expr)
 +
- 
- 
- ac_ext=cpp
-@@ -7651,7 +7730,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7654 "configure"' > conftest.$ac_ext
-+  echo '#line 7733 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -9436,11 +9515,11 @@
-    -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:9439: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9518: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9443: \$? = $ac_status" >&5
-+   echo "$as_me:9522: \$? = $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.
-@@ -9704,11 +9783,11 @@
-    -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:9707: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9786: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9711: \$? = $ac_status" >&5
-+   echo "$as_me:9790: \$? = $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.
-@@ -9808,11 +9887,11 @@
-    -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:9811: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9890: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9815: \$? = $ac_status" >&5
-+   echo "$as_me:9894: \$? = $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
-@@ -11273,7 +11352,7 @@
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*|powerpc64*)
--    echo '#line 11276 "configure"' > conftest.$ac_ext
-+    echo '#line 11355 "configure"' > conftest.$ac_ext
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -11292,7 +11371,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -12137,7 +12216,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 12140 "configure"
-+#line 12219 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12237,7 +12316,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 12240 "configure"
-+#line 12319 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12568,9 +12647,6 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -12704,11 +12780,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+predep_objects=$lt_predep_objects
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+postdep_objects=$lt_postdep_objects
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -12720,7 +12796,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+compiler_lib_search_path=$lt_compiler_lib_search_path
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -12800,7 +12876,7 @@
- link_all_deplibs=$link_all_deplibs
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -14576,11 +14652,11 @@
-    -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:14579: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14655: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14583: \$? = $ac_status" >&5
-+   echo "$as_me:14659: \$? = $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.
-@@ -14680,11 +14756,11 @@
-    -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:14683: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14759: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14687: \$? = $ac_status" >&5
-+   echo "$as_me:14763: \$? = $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
-@@ -15216,7 +15292,7 @@
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*|powerpc64*)
--    echo '#line 15219 "configure"' > conftest.$ac_ext
-+    echo '#line 15295 "configure"' > conftest.$ac_ext
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -15235,7 +15311,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -15620,9 +15696,6 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC_CXX
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -15756,11 +15829,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+predep_objects=$lt_predep_objects_CXX
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+postdep_objects=$lt_postdep_objects_CXX
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -15772,7 +15845,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -15852,7 +15925,7 @@
- link_all_deplibs=$link_all_deplibs_CXX
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -16274,11 +16347,11 @@
-    -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:16277: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16350: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16281: \$? = $ac_status" >&5
-+   echo "$as_me:16354: \$? = $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.
-@@ -16378,11 +16451,11 @@
-    -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:16381: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16454: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16385: \$? = $ac_status" >&5
-+   echo "$as_me:16458: \$? = $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
-@@ -17823,7 +17896,7 @@
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*|powerpc64*)
--    echo '#line 17826 "configure"' > conftest.$ac_ext
-+    echo '#line 17899 "configure"' > conftest.$ac_ext
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -17842,7 +17915,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -18227,9 +18300,6 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC_F77
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -18363,11 +18433,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+predep_objects=$lt_predep_objects_F77
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+postdep_objects=$lt_postdep_objects_F77
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -18379,7 +18449,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -18459,7 +18529,7 @@
- link_all_deplibs=$link_all_deplibs_F77
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -18600,11 +18670,11 @@
-    -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:18603: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18673: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18607: \$? = $ac_status" >&5
-+   echo "$as_me:18677: \$? = $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.
-@@ -18868,11 +18938,11 @@
-    -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:18871: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18941: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18875: \$? = $ac_status" >&5
-+   echo "$as_me:18945: \$? = $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.
-@@ -18972,11 +19042,11 @@
-    -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:18975: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19045: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18979: \$? = $ac_status" >&5
-+   echo "$as_me:19049: \$? = $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
-@@ -20437,7 +20507,7 @@
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*|powerpc64*)
--    echo '#line 20440 "configure"' > conftest.$ac_ext
-+    echo '#line 20510 "configure"' > conftest.$ac_ext
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -20456,7 +20526,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -20841,9 +20911,6 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC_GCJ
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -20977,11 +21044,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+predep_objects=$lt_predep_objects_GCJ
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+postdep_objects=$lt_postdep_objects_GCJ
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -20993,7 +21060,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -21073,7 +21140,7 @@
- link_all_deplibs=$link_all_deplibs_GCJ
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -21324,9 +21391,6 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$GCC_RC
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -21460,11 +21524,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+predep_objects=$lt_predep_objects_RC
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+postdep_objects=$lt_postdep_objects_RC
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -21476,7 +21540,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -21556,7 +21620,7 @@
- link_all_deplibs=$link_all_deplibs_RC
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -22893,12 +22957,12 @@
- 
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+ #include <nsTArray.h>
+ #endif /* TOTEM_COMPLEX_PLUGIN */
+--- totem-2.18.2/configure.in	2007-05-16 17:33:09.000000000 +0200
++++ totem-2.18.2-new/configure.in	2007-10-31 16:30:38.000000000 +0100
+@@ -323,12 +323,12 @@
  	if test -z "$with_gecko"; then
- 				for g in $GECKOS; do
+ 		dnl Autodetect gecko
+ 		for g in $GECKOS; do
 -			if $PKG_CONFIG --exists $g-xpcom; then
 +			if $PKG_CONFIG --exists libxul; then
  				gecko=$g
@@ -863,62 +24,20 @@
  		done
 -	elif ! $PKG_CONFIG --exists $gecko-xpcom; then
 +	elif ! $PKG_CONFIG --exists libxul; then
- 		{ { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
- echo "$as_me: error: Gecko \"$gecko\" not found" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -22954,15 +23018,12 @@
-         pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
--		 \$MOZILLA-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin" 2>/dev/null`
-+  pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "libxul" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22975,15 +23036,12 @@
-         pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
--		 \$MOZILLA-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin" 2>/dev/null`
-+  pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "libxul" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23002,11 +23060,9 @@
-         _pkg_short_errors_supported=no
+ 		AC_MSG_ERROR([Gecko "$gecko" not found])
+ 	fi
+ 
+@@ -368,8 +368,7 @@
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
+ 	PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
+-		[$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin],,
++		[libxul],,
+                 [enable_browser_plugins=no])
  fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin"`
-+	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul"`
-         else
--	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
--		 $MOZILLA-plugin"`
-+	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
-@@ -23271,10 +23327,12 @@
+ # Check for other required modules, and merge CFLAGS, but not link
+@@ -408,24 +407,27 @@
  
  # Sets some variables, and check for xpidl
  if test "$enable_browser_plugins" = "yes" ; then
@@ -934,368 +53,71 @@
 +	MOZILLA_LIBS="`$PKG_CONFIG --libs libxul`"
  	MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-$MOZILLA_LIBDIR}"
  
- 	# Extract the first word of "xpidl", so it can be a program name with args.
-@@ -23290,7 +23348,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$MOZILLA_LIBDIR:$PATH"
-+as_dummy="$LIBXUL_SDK_DIR/bin:$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
-@@ -23338,7 +23396,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$MOZILLA_LIBDIR:$PATH"
-+as_dummy="$LIBXUL_SDK_DIR/bin:$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
-@@ -23378,17 +23436,12 @@
- 
- 
+-	AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
++	AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$LIBXUL_SDK_DIR/bin:$PATH])
+ 	if test "x$MOZILLA_XPIDL" = "xno"; then
+ 		AC_MSG_ERROR([xpidl compiler not found])
+ 	fi
  
-+
- fi
+-	AC_PATH_PROG([MOZILLA_XPT_LINK],[xpt_link],[no],[$MOZILLA_LIBDIR:$PATH])
++	AC_PATH_PROG([MOZILLA_XPT_LINK],[xpt_link],[no],[$LIBXUL_SDK_DIR/bin:$PATH])
+ 	if test "$MOZILLA_XPT_LINK" = "no"; then
+ 		AC_MSG_ERROR([xpt_link not found])
+ 	fi
  
+ 	AC_SUBST([MOZILLA_PREFIX])
+ 	AC_SUBST([MOZILLA_LIBDIR])
++	AC_SUBST([MOZILLA_LIBS])
+ 	AC_SUBST([MOZILLA_XPCOM_CFLAGS])
+ 	AC_SUBST([MOZILLA_INCLUDE_ROOT])
+ 	AC_ARG_VAR([MOZILLA_PLUGINDIR],[Where to install the plugin to])
+@@ -434,15 +436,7 @@
  # Search for the idl include directory
  if test "$enable_browser_plugins" = "yes" ; then
--		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
--		if test "x$MOZILLA_IDLDIR" = "x"; then
+ 	dnl This only works on gecko 1.8
+-	MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
+-	dnl Fallback for older versions
+-	if test "x$MOZILLA_IDLDIR" = "x"; then
 -		MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
 -	fi
--		if test "x$MOZILLA_IDLDIR" = "x"; then
+-	dnl Some distributions (Gentoo) have it in unusual places
+-	if test "x$MOZILLA_IDLDIR" = "x"; then
 -		MOZILLA_IDLDIR="$MOZILLA_INCLUDE_ROOT/idl"
 -	fi
-+		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/stable"
- 
++	MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/stable"
  
+ 	AC_SUBST([MOZILLA_IDLDIR])
  fi
-@@ -23577,233 +23630,6 @@
+@@ -515,32 +509,6 @@
  	fi
  fi
  
 -# check for some additional xpcom headers and for string compatibility
 -
 -if test "$enable_browser_plugins" = "yes"; then
--	ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+-	AC_LANG_PUSH([C++])
 -	__SAVE_CPPFLAGS=$CPPFLAGS
 -	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
 -
+-	AC_CHECK_HEADERS([nsTArray.h])
 -
--
--for ac_header in nsTArray.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## -------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
--## -------------------------------------------------------------------- ##
--_ASBOX
--     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--	{ echo "$as_me:$LINENO: checking whether we need string glue" >&5
--echo $ECHO_N "checking whether we need string glue... $ECHO_C" >&6; }
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
+-	AC_MSG_CHECKING([whether we need string glue])
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 -				#include <mozilla-config.h>
 -				#include <nsStringAPI.h>
--
--int
--main ()
--{
--
+-		],[
 -				nsDependentCString test("Test");
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  need_string_glue=no
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	need_string_glue=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--	{ echo "$as_me:$LINENO: result: $need_string_glue" >&5
--echo "${ECHO_T}$need_string_glue" >&6; }
+-		])],[need_string_glue=no],[need_string_glue=yes])
+-	AC_MSG_RESULT([$need_string_glue])
 -
 -	CPPFLAGS=$__SAVE_CPPFLAGS
--	ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
+-	AC_LANG_POP([C++])
 -
 -	if test "$need_string_glue" = "yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define NEED_STRING_GLUE 1
--_ACEOF
--
+-		AC_DEFINE([NEED_STRING_GLUE],[1],[Define if we need string glue])
 -	fi
 -fi
 -
  # check which plugins to enable
  
  if test "$enable_browser_plugins" = "yes"; then
-@@ -25929,6 +25755,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -26692,6 +26525,7 @@
- host_os!$host_os$ac_delim
- USE_NLS!$USE_NLS$ac_delim
- MSGFMT!$MSGFMT$ac_delim
-+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
- GMSGFMT!$GMSGFMT$ac_delim
- XGETTEXT!$XGETTEXT$ac_delim
- CATALOGS!$CATALOGS$ac_delim
-@@ -26699,7 +26533,6 @@
- DATADIRNAME!$DATADIRNAME$ac_delim
- GMOFILES!$GMOFILES$ac_delim
- INSTOBJEXT!$INSTOBJEXT$ac_delim
--INTLLIBS!$INTLLIBS$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26741,6 +26574,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+INTLLIBS!$INTLLIBS$ac_delim
- PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
- PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
- POFILES!$POFILES$ac_delim
-@@ -26774,13 +26608,13 @@
- INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
- ALL_LINGUAS!$ALL_LINGUAS$ac_delim
- PKG_CONFIG!$PKG_CONFIG$ac_delim
--GDU_MODULE_VERSION_CHECK_CFLAGS!$GDU_MODULE_VERSION_CHECK_CFLAGS$ac_delim
--GDU_MODULE_VERSION_CHECK_LIBS!$GDU_MODULE_VERSION_CHECK_LIBS$ac_delim
- HELP_DIR!$HELP_DIR$ac_delim
- OMF_DIR!$OMF_DIR$ac_delim
- DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
- ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
- ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
-+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
-+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26837,7 +26671,6 @@
- MOZILLA_XPT_LINK!$MOZILLA_XPT_LINK$ac_delim
- MOZILLA_PREFIX!$MOZILLA_PREFIX$ac_delim
- MOZILLA_LIBDIR!$MOZILLA_LIBDIR$ac_delim
--MOZILLA_XPCOM_CFLAGS!$MOZILLA_XPCOM_CFLAGS$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26879,6 +26712,8 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim
-+MOZILLA_XPCOM_CFLAGS!$MOZILLA_XPCOM_CFLAGS$ac_delim
- MOZILLA_INCLUDE_ROOT!$MOZILLA_INCLUDE_ROOT$ac_delim
- MOZILLA_PLUGINDIR!$MOZILLA_PLUGINDIR$ac_delim
- MOZILLA_IDLDIR!$MOZILLA_IDLDIR$ac_delim
-@@ -26939,7 +26774,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- totem-2.18.2/browser-plugin/totemPlugin.h	2007-03-26 02:50:03.000000000 +0200
-+++ totem-2.18.2-new/browser-plugin/totemPlugin.h	2007-10-31 16:30:31.000000000 +0100
-@@ -33,6 +33,9 @@
- #include "totemStringGlue.h"
- #endif
- 
-+#define NS_STATIC_CAST(__type, __ptr) static_cast< __type >(__ptr)
-+#define NS_REINTERPRET_CAST(__type, __expr) reinterpret_cast< __type >(__expr)
-+
- #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
- #include <nsTArray.h>
- #endif /* TOTEM_COMPLEX_PLUGIN */


Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- totem.spec	31 Oct 2007 15:41:37 -0000	1.113
+++ totem.spec	2 Nov 2007 17:14:39 -0000	1.114
@@ -28,6 +28,7 @@
 Requires: iso-codes
 Requires: %{name}-plparser = %{version}-%{release}
 
+BuildRequires: automake, autoconf, gnome-common, intltool, libtool
 BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
 BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
@@ -97,14 +98,16 @@
 # not find playbin the first time around
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla 
-%configure 			\
-	--enable-gstreamer 	\
-	--disable-lirc 		\
-	--disable-vanity 	\
-	--enable-mozilla 	\
-	--disable-nautilus	\
-	--disable-scrollkeeper  \
-	--disable-nvtv		\
+./autogen.sh 				\
+	--prefix=%{_prefix}		\
+	--sysconfdir=%{_sysconfdir}	\
+	--enable-gstreamer 		\
+	--disable-lirc 			\
+	--disable-vanity 		\
+	--enable-mozilla 		\
+	--disable-nautilus		\
+	--disable-scrollkeeper  	\
+	--disable-nvtv			\
 	--enable-gtk
 
 make %{?_smp_mflags}

More information about the fedora-extras-commits mailing list