GNOME.org
 

blam r588 - in trunk: . libblam

Author: atoker
Date: Sun Jun 15 19:55:52 2008
New Revision: 588
URL: http://svn.gnome.org/viewvc/blam?rev=588&view=rev

Log:
Remove gecko-utils


Removed:
   trunk/libblam/blam-gecko-utils.cpp
   trunk/libblam/blam-gecko-utils.h
Modified:
   trunk/configure.in
   trunk/libblam/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jun 15 19:55:52 2008
@@ -48,11 +48,11 @@
 GTKSHARP_REQUIRED_VERSION=2.8.2
 GNOMESHARP_REQUIRED_VERSION=2.16.1
 GCONF_REQUIRED_VERSION=2.4
-GECKOSHARP_REQUIRED_VERSION=0.11
+WEBKITSHARP_REQUIRED_VERSION=0.1
 
 PKG_CHECK_MODULES(BLAM,
 		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
-                  gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION
+			webkit-sharp-1.0 >= $WEBKITSHARP_REQUIRED_VERSION
 		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
 		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
 		  gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION)
@@ -67,162 +67,9 @@
 AC_SUBST(DBUS_LIBS)
 
 
-dnl ******************
-dnl Mozilla name check
-dnl ******************
-
-AC_MSG_CHECKING([which mozilla to use])
-
-MOZILLA=
-AC_ARG_WITH([mozilla],
-	AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird|xulrunner|seamonkey@:>@],
-		       [Whether to use mozilla, firefox, thunderbird, xulrunner or seamonkey gtkmozembed (default: mozilla)]),
-	[MOZILLA="$withval"])
-
-dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird, then the rest
-if test "x$MOZILLA" = "x"; then
-  if pkg-config --exists mozilla-gtkmozembed; then
-    MOZILLA=mozilla
-  elif pkg-config --exists firefox-gtkmozembed; then
-    MOZILLA=firefox
-  elif pkg-config --exists thunderbird-gtkmozembed; then
-    MOZILLA=thunderbird
-elif pkg-config --exists xulrunner-gtkmozembed; then
-    MOZILLA=xulrunner
-elif pkg-config --exists seamonkey-gtkmozembed; then
-    MOZILLA=seamonkey
-  else
-    AC_MSG_ERROR([no mozilla installation found])
-  fi
-elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"; then
-  AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
-fi
-
-AC_SUBST(MOZILLA)
-
-AC_MSG_RESULT([$MOZILLA])
-
-case "$MOZILLA" in
-mozilla) min_version=1.7 flavour=mozilla ;;
-firefox) min_version=0.10 flavour=toolkit ;;
-thunderbird) min_version=0.8 flavour=toolkit ;;
-xulrunner) min_version=1.8 flavour=toolkit ;;
-seamonkey) min_version=1.0 flavour=mozilla ;;
-esac
-
-MOZILLA_FLAVOUR=$flavour
-AC_SUBST(MOZILLA_FLAVOUR)
-
-PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version)
-AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
-AC_SUBST(MOZILLA_COMPONENT_LIBS)
-
-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
-AC_SUBST(MOZILLA_INCLUDE_ROOT)
-
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
-AC_SUBST(MOZILLA_HOME)
-
-MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"
-AC_SUBST(MOZILLA_PREFIX)
-
-dnl *************************************************************************
-dnl This is from Mozilla's configure.in. They set almost all the config stuff
-dnl they need in mozilla-config.h Except for this compiler flag, which can't
-dnl go in mozilla-config.h So we check the flag too and now we can include
-dnl mozilla-config.h without breaking epiphany.
-dnl This is really gcc-only
-dnl Do this test using CXX only since some versions of gcc
-dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions
-dnl only have short-wchar support for c++.
-AC_LANG_PUSH(C++)
-_SAVE_CXXFLAGS=$CXXFLAGS
-_SAVE_AM_CXXFLAGS=$AM_CXXFLAGS
-AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar"
-CXXFLAGS="$CXXFLAGS $AM_CXXFLAGS"
-
-AC_CACHE_CHECK(for compiler -fshort-wchar option,
-    ac_cv_have_usable_wchar_option,
-    [AC_TRY_RUN([#include <stddef.h>
-                 int main () {
-                   return (sizeof(wchar_t) != 2) ||
-                          (wchar_t)-1 < (wchar_t) 0 ; } ],
-                ac_cv_have_usable_wchar_option="yes",
-                ac_cv_have_usable_wchar_option="no",
-                ac_cv_have_usable_wchar_option="maybe")])
-
-if test "$ac_cv_have_usable_wchar_option" != "yes"; then
-    AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
-fi
-
-dnl **********************************
-dnl now tests for mozilla API variance
-dnl **********************************
-
-dnl FIXME find a m4/autoconf guru who can distill this into a nice macro
-
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
-
-dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
-
-AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <nsEmbedString.h>
-		  #include <widget/nsIFilePicker.h>]],
-		[[nsIFilePicker *p;
-		  p->SetDefaultString (nsEmbedString());]]
-	)],
-	[AC_DEFINE([MOZ_NSIFILEPICKER_NSASTRING_],[1],[Define if nsIFilePicker uses nsAString&]) result=yes],
-	[result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl Changed from char* to nsAString& in 1.8a1
-
-AC_MSG_CHECKING([whether nsIMIMEInfo methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <nsEmbedString.h>
-		  #include <mimetype/nsIMIMEInfo.h>]],
-		[[nsIMIMEInfo *p;
-		  p->SetDescription (nsEmbedString());]]
-	)],
-	[AC_DEFINE([MOZ_NSIMIMEINFO_NSACSTRING_],[1],[Define if nsIMIMEInfo uses nsAString&]) result=yes],
-	[result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl Firefox doesn't have this API (?)
-
-AC_MSG_CHECKING([for nsIXULChromeRegistry API])
-
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <nsEmbedString.h>
-		  #include <content/nsIChromeRegistry.h>]],
-		[[nsIXULChromeRegistry *p;
-		  p->SelectSkin (nsEmbedCString(), PR_FALSE);]]
-	)],
-	[AC_DEFINE([MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN],[1],[dummy]) result=yes],
-	[result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl changed from nsIXULChromeRegistry in 1.8a4
-
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
-	[AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
-
-MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
-AC_SUBST(MOZILLA_WARN_CXXFLAGS)
-
 dnl libblam
 PKG_CHECK_MODULES(LIBBLAM,
-                  gtk+-2.0 >= 2.2
-                  $MOZILLA-gtkmozembed)
+                  gtk+-2.0 >= 2.2)
 AC_SUBST(LIBBLAM_CFLAGS)
 AC_SUBST(LIBBLAM_LIBS)
 
@@ -261,6 +108,5 @@
 echo
 echo "Installing in prefix: $prefix"
 echo 
-echo "Using Mozilla: $MOZILLA"
 echo "Enable D-Bus: $ENABLE_DBUS"
 echo

Modified: trunk/libblam/Makefile.am
==============================================================================
--- trunk/libblam/Makefile.am	(original)
+++ trunk/libblam/Makefile.am	Sun Jun 15 19:55:52 2008
@@ -2,25 +2,12 @@
 	-I $(top_srcdir)					\
         -DG_LOG_DOMAIN=\"libblam\"				\
 	$(LIBBLAM_CFLAGS)                                       \
-	-I$(MOZILLA_INCLUDE_ROOT)/content		  \
-	-I$(MOZILLA_INCLUDE_ROOT)/dom                     \
-	-I$(MOZILLA_INCLUDE_ROOT)/find                    \
-	-I$(MOZILLA_INCLUDE_ROOT)/locale		\
-	-I$(MOZILLA_INCLUDE_ROOT)/webbrwsr		  \
-	-I$(MOZILLA_INCLUDE_ROOT)/string		  \
-	-I$(MOZILLA_INCLUDE_ROOT)/pref                    \
-	-I$(MOZILLA_INCLUDE_ROOT)/gfx                     \
-	-DALLOW_PRIVATE_API                               \
-        -DMOZILLA_HOME=\""$(MOZILLA_HOME)\""              \
-        -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h \
 	$(WERROR)
 
 blamlibdir = $(prefix)/lib/blam
 blamlib_LTLIBRARIES = libblam.la
 
 libblam_la_SOURCES =				\
-        blam-gecko-utils.cpp                    \
-        blam-gecko-utils.h                      \
 	bacon-message-connection.c              \
 	bacon-message-connection.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]