anjuta r4932 - in trunk: . plugins plugins/scintilla po

[jhs svn gnome org]

Author: jhs
Date: Wed Apr  8 07:20:43 2009
New Revision: 4932
URL: http://svn.gnome.org/viewvc/anjuta?rev=4932&view=rev

Log:
2009-04-08  Johannes Schmid  <jhs gnome org>

	* POTFILES.in:
	* POTFILES.skip:
	Updated

Removed:
   trunk/plugins/scintilla/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr  8 07:20:43 2009
@@ -77,22 +77,14 @@
 AC_PROG_CPP
 AC_LANG_C
 
-#Check for C++ Compiler
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-
 GNOME_COMPILE_WARNINGS(maximum)
-GNOME_CXX_WARNINGS(yes)
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
-AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
 
 dnl Enable debugging mode
 AC_ARG_ENABLE(debug,
   AC_HELP_STRING([--enable-debug],[Enable debug messages]),
   AM_CFLAGS="$AM_CFLAGS -DDEBUG"
-  AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG")
 AC_SUBST(AM_CFLAGS)
-AC_SUBST(AM_CXXFLAGS)
 
 ANJUTA_LDFLAGS="-no-undefined"
 ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version -no-undefined"
@@ -273,26 +265,6 @@
 
 AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
 
-dnl Scintilla Editor
-dnl -------------------------------------------------------------
-
-AC_ARG_ENABLE(plugin-scintilla,
-	AC_HELP_STRING([--disable-plugin-scintilla],[ Scintilla based editor in Anjuta]), 
-	[ if test "$enableval" = "no"; then
-		user_disabled_scintilla=1
-	  fi ],
-	[ user_disabled_scintilla=0 ])
-
-AC_MSG_CHECKING(if scintilla plugin is enabled)
-if test "$user_disabled_scintilla" = 1; then
-	AC_MSG_RESULT(no)
-	scintilla="no"
-else
-	AC_MSG_RESULT(yes)
-	scintilla="yes"
-fi
-AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
-
 PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
 		[libgda-4.0 >= $GDA_REQUIRED])
 
@@ -768,10 +740,6 @@
 plugins/class-gen/Makefile
 plugins/class-gen/templates/Makefile
 plugins/patch/Makefile
-plugins/scintilla/Makefile
-plugins/scintilla/scintilla/Makefile
-plugins/scintilla/scintilla/include/Makefile
-plugins/scintilla/properties/Makefile
 plugins/document-manager/Makefile
 plugins/document-manager/images/Makefile
 plugins/search/Makefile
@@ -903,13 +871,6 @@
 else
         echo "Building GtkSourceView based editor: ...................NO"
 fi
-
-if [ test x$scintilla = xyes ]; then
-        echo "Building Scintilla based editor: .......................YES"
-else
-        echo "Building Scintilla based editor: .......................NO"
-fi
 echo "-------------------------------------------------------------------"
 #echo "AM_CFLAGS = $AM_CFLAGS"
-#echo "AM_CXXFLAGS = $AM_CXXFLAGS"
 

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Wed Apr  8 07:20:43 2009
@@ -3,7 +3,6 @@
 SUBDIRS = . \
 	gtodo \
 	message-view \
-	scintilla \
 	gdb \
 	debug-manager \
 	file-manager \

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Apr  8 07:20:43 2009
@@ -165,10 +165,6 @@
 plugins/run-program/execute.c
 plugins/run-program/parameters.c
 plugins/run-program/plugin.c
-plugins/scintilla/anjuta-editor-scintilla.glade
-plugins/scintilla/print.c
-plugins/scintilla/plugin.c
-plugins/scintilla/text_editor.c
 plugins/scratchbox/anjuta-scratchbox.glade
 plugins/scratchbox/plugin.c
 plugins/search/anjuta-search.glade
@@ -252,8 +248,6 @@
 [type: gettext/ini]plugins/cvs-plugin/anjuta-cvs.plugin.in
 [type: gettext/ini]plugins/project-import/anjuta-project-import.plugin.in
 [type: gettext/ini]plugins/sourceview/sourceview.plugin.in
-[type: gettext/ini]plugins/scintilla/anjuta-editor.plugin.in
-[type: gettext/ini]plugins/scratchbox/anjuta-scratchbox.plugin.in
 [type: gettext/ini]plugins/starter/anjuta-starter.plugin.in
 [type: gettext/ini]plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in
 [type: gettext/ini]plugins/project-wizard/anjuta-project-wizard.plugin.in