Mercurial > dwindows

changeset 1094:b2a4cfc3cb87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable use of WebKit 1.0 under ubuntu Natty; package name: webkit-1.0 does not match name of library, libwebkitgtk-1.0
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 30 Jun 2011 04:48:10 +0000
parents 25707e9f5ad1
children 1ab93c92d3ea
files configure configure.in
diffstat 2 files changed, 98 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Wed Jun 29 18:33:59 2011 +0000
+++ b/configure	Thu Jun 30 04:48:10 2011 +0000
@@ -4612,7 +4612,16 @@
 
 
    if test x"$PKG_CFG" != x; then
-      GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
+      GTK_PACKAGES="gtk+-3.0"
+      GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
+      WEBKIT_PKG="webkit-1.1"
+      if test x"$GTK_LIBS" = x; then
+         GTK_PACKAGES="gtk+-2.0 gthread-2.0"
+         GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
+      else
+         DW_DIR=gtk3
+         WEBKIT_PKG="webkitgtk-3.0"
+      fi
       if test $with_gtkmozembed = yes; then
          MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
          MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed`
@@ -4627,25 +4636,85 @@
          MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
          RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
       else
-         WEBKIT_LIB="webkit-1.1"
-         MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-         RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+         # test for webkit-1.1 or webkitgtk-3.0 packages
+         MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
+         RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
          if test x"$MOZEMBED_CFLAGS" = x; then
-            WEBKIT_LIB="webkit-1.0"
-            MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-            RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+            # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0
+            WEBKIT_PKG="webkit-1.0"
+            MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
+            RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             if test x"$MOZEMBED_CFLAGS" = x; then
-               WEBKIT_LIB="WebKitGtk"
-#               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_LIB`
-               MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-               RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+               WEBKIT_PKG="WebKitGtk"
+#               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 test "${ac_cv_search_webkit_web_view_new+set}" = set; 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 test "${ac_cv_search_webkit_web_view_new+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_webkit_web_view_new+set}" = set; 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
+
             fi
          else
             $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
 
+            WEBKIT_LIB=$WEBKIT_PKG
          fi
          cat >>confdefs.h <<_ACEOF
 #define WEBKIT_LIB "$WEBKIT_LIB"
@@ -5412,8 +5481,8 @@
   rm -f conf.gdkimlibtest
 
    else
-      GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
-      GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
+      GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES`
+      GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES`
    fi
 fi
 
@@ -6538,7 +6607,7 @@
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
--- a/configure.in	Wed Jun 29 18:33:59 2011 +0000
+++ b/configure.in	Thu Jun 30 04:48:10 2011 +0000
@@ -198,13 +198,13 @@
    if test x"$PKG_CFG" != x; then
       GTK_PACKAGES="gtk+-3.0"
       GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
-      WEBKIT_LIB="webkit-1.1"
+      WEBKIT_PKG="webkit-1.1"
       if test x"$GTK_LIBS" = x; then
          GTK_PACKAGES="gtk+-2.0 gthread-2.0"
          GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
       else
          DW_DIR=gtk3
-         WEBKIT_LIB="webkitgtk-3.0"
+         WEBKIT_PKG="webkitgtk-3.0"
       fi
       if test $with_gtkmozembed = yes; then
          MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
@@ -220,22 +220,26 @@
          MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
          RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
       else
-         MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-         RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+         # test for webkit-1.1 or webkitgtk-3.0 packages
+         MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
+         RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
          if test x"$MOZEMBED_CFLAGS" = x; then
-            WEBKIT_LIB="webkit-1.0"
-            MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-            RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+            # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0
+            WEBKIT_PKG="webkit-1.0"
+            MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
+            RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             if test x"$MOZEMBED_CFLAGS" = x; then
-               WEBKIT_LIB="WebKitGtk"
-#               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_LIB`
-               MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
-               RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
+               WEBKIT_PKG="WebKitGtk"
+#               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
                AC_DEFINE(USE_WEBKIT10)
+               AC_SEARCH_LIBS(webkit_web_view_new,webkit-1.0 webkitgtk-1.0,WEBKIT_LIB=`echo $ac_res | cut -b 3-`,WEBKIT_LIB="")
             fi
          else
             AC_DEFINE(USE_WEBKIT11)
+            WEBKIT_LIB=$WEBKIT_PKG
          fi
          AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB")
       fi