epiphany-extensions r1803 - in branches/gnome-2-24: . m4

[chpe svn gnome org]

Author: chpe
Date: Sun Jan 25 15:48:38 2009
New Revision: 1803
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1803&view=rev

Log:
Remove engine check.

Modified:
   branches/gnome-2-24/configure.ac
   branches/gnome-2-24/m4/epiphany.m4

Modified: branches/gnome-2-24/configure.ac
==============================================================================
--- branches/gnome-2-24/configure.ac	(original)
+++ branches/gnome-2-24/configure.ac	Sun Jan 25 15:48:38 2009
@@ -227,15 +227,6 @@
 done
 IFS="$ephyext_save_ifs"
 
-if test "$EPIPHANY_ENGINE" != "mozilla"; then
- extensions=$EXTENSIONS; EXTENSIONS=
- for ext in $extensions; do
-  if echo "$MOZILLA_ALL_EXTENSIONS" | egrep -v "(^| )$ext(\$| )" > /dev/null; then
-    EXTENSIONS="$EXTENSIONS $ext"
-  fi
- done
-fi
-
 AC_SUBST([DIST_EXTENSIONS])
 AC_SUBST([BUILD_EXTENSIONS],[$(echo $EXTENSIONS | tr ' ' '\n' | sort | uniq | tr '\n' ' ')])
 
@@ -314,8 +305,6 @@
 # Mozilla
 # *******
 
-if test "$EPIPHANY_ENGINE" = "mozilla"; then
-
 GECKO_INIT([MOZILLA])
 
 AC_SUBST([MOZILLA])
@@ -364,8 +353,6 @@
 fi
 
 
-fi # test "$EPIPHANY_ENGINE" != "webkit"
-
 GECKO_DEFINES
 
 # *****************

Modified: branches/gnome-2-24/m4/epiphany.m4
==============================================================================
--- branches/gnome-2-24/m4/epiphany.m4	(original)
+++ branches/gnome-2-24/m4/epiphany.m4	Sun Jan 25 15:48:38 2009
@@ -13,7 +13,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ##
 ## As a special exception to the GNU General Public License, if you
 ## distribute this file as part of a program that contains a
@@ -64,12 +64,12 @@
 ])
 
 dnl set the EPIPHANY_EXTENSIONS_DIR variable
-EPIPHANY_EXTENSIONS_DIR="$($PKG_CONFIG --variable=extensionsdir epiphany-$_epiphany_api_version)"
+EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=extensionsdir epiphany-$_epiphany_api_version`"
 AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
 
 dnl Look to see if epiphany has python support
 AC_MSG_CHECKING([whether epiphany has python support])
-_epiphany_features="$($PKG_CONFIG --variable=features epiphany-$_epiphany_api_version)"
+_epiphany_features="`$PKG_CONFIG --variable=features epiphany-$_epiphany_api_version`"
 if echo "$_epiphany_features" | egrep '(^| )(python)($| )' > /dev/null; then
     result=yes
     EPIPHANY_HAS_PYTHON=1
@@ -85,12 +85,4 @@
 
 AC_SUBST(EPIPHANY_EXTENSION_RULE)
 
-dnl Check which engine is being used
-EPIPHANY_ENGINE="$($PKG_CONFIG --variable=engine epiphany-$EPIPHANY_API_VERSION)"
-AC_SUBST(EPIPHANY_ENGINE)
-
-dnl Icon dir
-EPIPHANY_ICONDIR="$($PKG_CONFIG --variable=icondir epiphany-$EPIPHANY_API_VERSION)"
-AC_SUBST(EPIPHANY_ICONDIR)
-
 ])