# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1317163105 0
# Node ID c5419ef79a77de39ce2e196645f358958d9796ae
# Parent  ec33913d379b4e60f61b238ba955759525d3bce1
Committing the configure script now that it works on both FreeBSD and Ubuntu.

diff -r ec33913d379b -r c5419ef79a77 configure
--- a/configure	Tue Sep 27 22:36:03 2011 +0000
+++ b/configure	Tue Sep 27 22:38:25 2011 +0000
@@ -4734,70 +4734,18 @@
             RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             if test x"$MOZEMBED_CFLAGS" = x; then
                WEBKIT_PKG="WebKitGtk"
-#               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
+               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
                MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
                RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             else
                $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing webkit_web_view_new" >&5
-$as_echo_n "checking for library containing webkit_web_view_new... " >&6; }
-if ${ac_cv_search_webkit_web_view_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* 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 webkit_web_view_new ();
-int
-main ()
-{
-return webkit_web_view_new ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' webkit-1.0 webkitgtk-1.0; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_webkit_web_view_new=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_webkit_web_view_new+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_webkit_web_view_new+:} false; then :
-
-else
-  ac_cv_search_webkit_web_view_new=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_webkit_web_view_new" >&5
-$as_echo "$ac_cv_search_webkit_web_view_new" >&6; }
-ac_res=$ac_cv_search_webkit_web_view_new
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  WEBKIT_LIB=`echo $ac_res | cut -b 3-`
-else
-  WEBKIT_LIB=""
-fi
-
+               WEBKIT_LIB=$WEBKIT_PKG
+               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
+               RESULT=`echo $MOZEMBED_LIBS | grep lwebkitgtk-1.0`
+               if test x"$RESULT" != x; then
+                   WEBKIT_LIB=webkitgtk-1.0
+               fi
             fi
          else
             $as_echo "#define USE_WEBKIT11 1" >>confdefs.h