[gedit-plugins] Update to work with latest gedit.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 7a382f4b460725f86ea3f4a040fdaf7f9952c072
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Jul 2 15:10:32 2010 +0200

    Update to work with latest gedit.
    
    Added peas/ui dependencies. Removed gconf and bumped gedit.
    Also removed the python checks.

 configure.ac |  142 +++++-----------------------------------------------------
 1 files changed, 12 insertions(+), 130 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 779a556..1bed8eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([config.h])
 AC_DISABLE_STATIC
 
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
 IT_PROG_INTLTOOL([0.35.0])
 
 AC_PROG_LIBTOOL
@@ -31,6 +30,8 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+AM_PATH_PYTHON
+
 # make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
 
@@ -60,37 +61,16 @@ AM_GLIB_GNU_GETTEXT
 # Start of pkg-config checks
 # ================================================================
 
-# Dependencies
-GTK_REQUIRED=
-GTK_REQUIRED_VERSION=
-GSV_REQUIRED=
-
-PKG_CHECK_EXISTS([gtk+-3.0 >= 2.90],
-		 [
-		 	GTK_REQUIRED=gtk+-3.0
-		 	GTK_REQUIRED_VERSION=2.90.0
-		 	GSV_REQUIRED=gtksourceview-3.0
-		 ],[
-		 	GTK_REQUIRED=gtk+-2.0
-		 	GTK_REQUIRED_VERSION=2.16.0
-		 	GSV_REQUIRED=gtksourceview-2.0
-		 ])
-
 PKG_CHECK_MODULES(GEDIT, [
 	glib-2.0 >= 2.25.6
 	gio-2.0 >= 2.25.4
-	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
-	gconf-2.0 >= 1.1.11
-	$GSV_REQUIRED >= 2.9.1
-	gedit-3.0 >= 2.31.1
+	gtk+-3.0 >= 2.90.0
+	gtksourceview-3.0 >= 2.9.1
+	libpeas-1.0
+	libpeasui-1.0
+	gedit >= 2.31.4
 ])
 
-# ================================================================
-# GConf related settings
-# ================================================================
-
-AM_GCONF_SOURCE_2
-
 dnl ================================================================
 dnl GSettings stuff
 dnl ================================================================
@@ -186,106 +166,8 @@ AC_MSG_RESULT([$PLUGINS])
 AC_MSG_CHECKING([whether Python support is requested])
 AC_ARG_ENABLE([python],
 	      AS_HELP_STRING([--enable-python], [Enable python support]),
-	      [enable_python=$enableval have_python=$enableval],
-	      [enable_python=autodetect have_python=yes])
-AC_MSG_RESULT([$enable_python])
-
-if test "x$have_python" != "xno"
-then
-	AM_PATH_PYTHON([2.3], [], [no])
-	if test "x$PYTHON" = "x:"
-	then
-		have_python=no
-	fi
-fi
-
-if test "x$have_python" != "xno"
-then
-	AM_CHECK_PYTHON_HEADERS([], [have_python=no])
-fi
-
-if test "x$have_python" != "xno"
-then
-	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
-	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
-	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
-	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
-	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
-	AC_SUBST([PYTHON_LIBS])
-	AC_SUBST([PYTHON_LIB_LOC])
-	AC_SUBST([PYTHON_CFLAGS])
-	AC_SUBST([PYTHON_EXTRA_LIBS])
-fi
-
-if test "x$have_python" != "xno"
-then
-	PYGOBJECT_REQUIRED=2.15.4
-	PYGTK_REQUIRED=2.12.0
-	PYGTKSOURCEVIEW_REQUIRED=2.2.0
-
-	PKG_CHECK_MODULES([PYGTK], [
-		pygobject-2.0 >= $PYGOBJECT_REQUIRED
-		pygtk-2.0 >= $PYGTK_REQUIRED
-		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED],
-		[],[have_python=no])
-
-	AC_SUBST([PYGTK_CFLAGS])
-	AC_SUBST([PYGTK_LIBS])
-fi
-
-if test "x$have_python" != "xno"
-then
-	AC_MSG_CHECKING([for pygtk defs])
-	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-	AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygtk codegen])
-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-	AC_MSG_RESULT([$PYGTK_CODEGEN])
-
-	AC_MSG_CHECKING([for pygtk h2def])
-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-	AC_MSG_RESULT([$PYGTK_H2DEF])
-
-	AC_SUBST([PYGTK_DEFSDIR])
-	AC_SUBST([PYGTK_CODEGEN])
-	AC_SUBST([PYGTK_H2DEF])
-
-	dnl Check for -fno-strict-aliasing
-	FLAGS="-fno-strict-aliasing"
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $FLAGS"
-	AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-	AC_TRY_COMPILE([], [], [compiler_has_option=yes], [compiler_has_option=no])
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT($compiler_has_option)
-	if test $compiler_has_option = yes
-	then
-		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-	fi
-	AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-fi
-
-if test "x$have_python" != "xyes"
-then
-	if test "x$enable_python" = "xyes"
-	then
-		AC_MSG_ERROR([Python not found])
-	elif test "x$enable_python" = "xautodetect"
-	then
-		enable_python=no
-		AC_MSG_WARN([Python not found, disabling python support])
-	fi
-elif test "x$enable_python" != "xno"
-then
-	enable_python=yes
-	AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
-fi
+	      [enable_python=$enableval],
+	      [enable_python="yes"])
 
 AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
 
@@ -399,7 +281,7 @@ AC_SUBST([BUILD_PLUGINS],[$PLUGINS])
 # Misc
 # ================================================================
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-			      
+
 #GNOME_COMPILE_WARNINGS(yes)
 
 AC_ARG_ENABLE(deprecations,
@@ -425,10 +307,10 @@ else
 fi
 AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 
-GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit-2/plugins"
+GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit/plugins"
 AC_SUBST(GEDIT_PLUGINS_LIBS_DIR)
 
-GEDIT_PLUGINS_DATA_DIR="$datadir/gedit-2/plugins"
+GEDIT_PLUGINS_DATA_DIR="$datadir/gedit/plugins"
 AC_SUBST(GEDIT_PLUGINS_DATA_DIR)
 
 AC_CONFIG_FILES([