GNOME.org
 

[anjuta-extras: 9/11] configure.ac: Remove gconf2 macros

commit d902cee773bbaf8af946084052cc9bc498a74d76
Merge: 3ff6eb0 e688677
Author: James Liggett <jrliggett cox net>
Date:   Sat Jun 4 14:04:58 2011 -0700

    configure.ac: Remove gconf2 macros

 configure.ac                                       |   35 +-
 plugins/Makefile.am                                |    4 +-
 plugins/scintilla/Makefile.am                      |    1 +
 plugins/scintilla/aneditor-indent.cxx              |   14 +-
 plugins/scintilla/aneditor-priv.h                  |    2 -
 plugins/scintilla/aneditor.cxx                     |   81 +-
 plugins/scintilla/anjuta-editor-scintilla.ui       |  563 ++++++---
 plugins/scintilla/plugin.c                         |    2 +-
 plugins/scintilla/properties/anjuta.properties     |    2 +-
 plugins/scintilla/properties/styles.properties     |  833 ++++++++++--
 plugins/scintilla/scintilla/Accessor.cxx           |   79 ++
 plugins/scintilla/scintilla/Accessor.h             |   35 +
 plugins/scintilla/scintilla/AutoComplete.cxx       |   15 +-
 plugins/scintilla/scintilla/AutoComplete.h         |    6 +-
 plugins/scintilla/scintilla/CallTip.cxx            |    9 +-
 plugins/scintilla/scintilla/CallTip.h              |    4 +-
 plugins/scintilla/scintilla/Catalogue.cxx          |  186 +++
 plugins/scintilla/scintilla/Catalogue.h            |   26 +
 plugins/scintilla/scintilla/CellBuffer.cxx         |   45 +-
 plugins/scintilla/scintilla/CellBuffer.h           |   21 +-
 plugins/scintilla/scintilla/CharClassify.cxx       |   38 +-
 plugins/scintilla/scintilla/CharClassify.h         |   15 +-
 plugins/scintilla/scintilla/CharacterSet.cxx       |   61 +
 plugins/scintilla/scintilla/CharacterSet.h         |  104 ++-
 plugins/scintilla/scintilla/ContractionState.cxx   |   21 +-
 plugins/scintilla/scintilla/ContractionState.h     |    1 +
 plugins/scintilla/scintilla/Converter.h            |   19 +-
 plugins/scintilla/scintilla/Decoration.h           |    4 +-
 plugins/scintilla/scintilla/Document.cxx           |  748 ++++++++--
 plugins/scintilla/scintilla/Document.h             |  167 ++-
 plugins/scintilla/scintilla/DocumentAccessor.cxx   |  199 ---
 plugins/scintilla/scintilla/DocumentAccessor.h     |   77 -
 plugins/scintilla/scintilla/Editor.cxx             | 1186 ++++++++++++----
 plugins/scintilla/scintilla/Editor.h               |   79 +-
 plugins/scintilla/scintilla/ExternalLexer.cxx      |  122 +--
 plugins/scintilla/scintilla/ExternalLexer.h        |   42 +-
 plugins/scintilla/scintilla/Indicator.cxx          |    4 +-
 plugins/scintilla/scintilla/Indicator.h            |    3 +-
 plugins/scintilla/scintilla/KeyWords.cxx           |  429 ------
 plugins/scintilla/scintilla/LexA68k.cxx            |  318 +++++
 plugins/scintilla/scintilla/LexAPDL.cxx            |   15 +-
 plugins/scintilla/scintilla/LexASY.cxx             |   27 +-
 plugins/scintilla/scintilla/LexAU3.cxx             |  135 +-
 plugins/scintilla/scintilla/LexAVE.cxx             |   19 +-
 plugins/scintilla/scintilla/LexAbaqus.cxx          |   15 +-
 plugins/scintilla/scintilla/LexAccessor.h          |  175 +++
 plugins/scintilla/scintilla/LexAda.cxx             |   14 +-
 plugins/scintilla/scintilla/LexAsm.cxx             |  338 +++++-
 plugins/scintilla/scintilla/LexAsn1.cxx            |   15 +-
 plugins/scintilla/scintilla/LexBaan.cxx            |   15 +-
 plugins/scintilla/scintilla/LexBash.cxx            |  280 +++-
 plugins/scintilla/scintilla/LexBasic.cxx           |  383 ++++--
 plugins/scintilla/scintilla/LexBullant.cxx         |   19 +-
 plugins/scintilla/scintilla/LexCLW.cxx             |   45 +-
 plugins/scintilla/scintilla/LexCOBOL.cxx           |   21 +-
 plugins/scintilla/scintilla/LexCPP.cxx             |  926 +++++++++++--
 plugins/scintilla/scintilla/LexCSS.cxx             |   35 +-
 plugins/scintilla/scintilla/LexCaml.cxx            |   29 +-
 plugins/scintilla/scintilla/LexCmake.cxx           |   18 +-
 plugins/scintilla/scintilla/LexConf.cxx            |   28 +-
 plugins/scintilla/scintilla/LexCrontab.cxx         |   24 +-
 plugins/scintilla/scintilla/LexCsound.cxx          |   24 +-
 plugins/scintilla/scintilla/LexD.cxx               |  289 +++-
 plugins/scintilla/scintilla/LexEScript.cxx         |   15 +-
 plugins/scintilla/scintilla/LexEiffel.cxx          |   17 +-
 plugins/scintilla/scintilla/LexErlang.cxx          |   26 +-
 plugins/scintilla/scintilla/LexFlagship.cxx        |  382 ++++--
 plugins/scintilla/scintilla/LexForth.cxx           |   19 +-
 plugins/scintilla/scintilla/LexFortran.cxx         |   19 +-
 plugins/scintilla/scintilla/LexGAP.cxx             |   17 +-
 plugins/scintilla/scintilla/LexGen.py              |  304 ++++
 plugins/scintilla/scintilla/LexGui4Cli.cxx         |   15 +-
 plugins/scintilla/scintilla/LexHTML.cxx            |  236 +++-
 plugins/scintilla/scintilla/LexHaskell.cxx         |  267 +++--
 plugins/scintilla/scintilla/LexInno.cxx            |   27 +-
 plugins/scintilla/scintilla/LexKix.cxx             |   15 +-
 plugins/scintilla/scintilla/LexLisp.cxx            |   19 +-
 plugins/scintilla/scintilla/LexLout.cxx            |   15 +-
 plugins/scintilla/scintilla/LexLua.cxx             |   59 +-
 plugins/scintilla/scintilla/LexMMIXAL.cxx          |   17 +-
 plugins/scintilla/scintilla/LexMPT.cxx             |   32 +-
 plugins/scintilla/scintilla/LexMSSQL.cxx           |   16 +-
 plugins/scintilla/scintilla/LexMagik.cxx           |   15 +-
 plugins/scintilla/scintilla/LexMarkdown.cxx        |   76 +-
 plugins/scintilla/scintilla/LexMatlab.cxx          |   15 +-
 plugins/scintilla/scintilla/LexMetapost.cxx        |   31 +-
 plugins/scintilla/scintilla/LexModula.cxx          |  743 ++++++++++
 plugins/scintilla/scintilla/LexMySQL.cxx           |  215 ++--
 plugins/scintilla/scintilla/LexNimrod.cxx          |   33 +-
 plugins/scintilla/scintilla/LexNsis.cxx            |   18 +-
 plugins/scintilla/scintilla/LexOpal.cxx            |   71 +-
 plugins/scintilla/scintilla/LexOthers.cxx          |   75 +-
 plugins/scintilla/scintilla/LexPB.cxx              |   15 +-
 plugins/scintilla/scintilla/LexPLM.cxx             |   15 +-
 plugins/scintilla/scintilla/LexPOV.cxx             |   15 +-
 plugins/scintilla/scintilla/LexPS.cxx              |   17 +-
 plugins/scintilla/scintilla/LexPascal.cxx          |  162 ++--
 plugins/scintilla/scintilla/LexPerl.cxx            | 1000 ++++++++------
 plugins/scintilla/scintilla/LexPowerPro.cxx        |  396 +++---
 plugins/scintilla/scintilla/LexPowerShell.cxx      |   44 +-
 plugins/scintilla/scintilla/LexProgress.cxx        |   19 +-
 plugins/scintilla/scintilla/LexPython.cxx          |   51 +-
 plugins/scintilla/scintilla/LexR.cxx               |   19 +-
 plugins/scintilla/scintilla/LexRebol.cxx           |   15 +-
 plugins/scintilla/scintilla/LexRuby.cxx            |  168 ++-
 plugins/scintilla/scintilla/LexSML.cxx             |   30 +-
 plugins/scintilla/scintilla/LexSQL.cxx             |  540 +++++++--
 plugins/scintilla/scintilla/LexScriptol.cxx        |   21 +-
 plugins/scintilla/scintilla/LexSmalltalk.cxx       |   33 +-
 plugins/scintilla/scintilla/LexSorcus.cxx          |  135 +-
 plugins/scintilla/scintilla/LexSpecman.cxx         |   13 +-
 plugins/scintilla/scintilla/LexSpice.cxx           |   14 +-
 plugins/scintilla/scintilla/LexTACL.cxx            |   15 +-
 plugins/scintilla/scintilla/LexTADS3.cxx           |   27 +-
 plugins/scintilla/scintilla/LexTAL.cxx             |   17 +-
 plugins/scintilla/scintilla/LexTCL.cxx             |   29 +-
 plugins/scintilla/scintilla/LexTeX.cxx             |   55 +-
 plugins/scintilla/scintilla/LexTxt2tags.cxx        |  480 +++++++
 plugins/scintilla/scintilla/LexVB.cxx              |   15 +-
 plugins/scintilla/scintilla/LexVHDL.cxx            |   60 +-
 plugins/scintilla/scintilla/LexVerilog.cxx         |   40 +-
 plugins/scintilla/scintilla/LexYAML.cxx            |   17 +-
 plugins/scintilla/scintilla/LexerBase.cxx          |   92 ++
 plugins/scintilla/scintilla/LexerBase.h            |   41 +
 plugins/scintilla/scintilla/LexerModule.cxx        |  121 ++
 plugins/scintilla/scintilla/LexerModule.h          |   82 ++
 plugins/scintilla/scintilla/LexerNoExceptions.cxx  |   68 +
 plugins/scintilla/scintilla/LexerNoExceptions.h    |   32 +
 plugins/scintilla/scintilla/LexerSimple.cxx        |   57 +
 plugins/scintilla/scintilla/LexerSimple.h          |   30 +
 plugins/scintilla/scintilla/LineMarker.cxx         |  140 ++-
 plugins/scintilla/scintilla/LineMarker.h           |   13 +-
 plugins/scintilla/scintilla/Makefile.am            |   57 +-
 plugins/scintilla/scintilla/OptionSet.h            |  142 ++
 plugins/scintilla/scintilla/Partitioning.h         |    7 +-
 plugins/scintilla/scintilla/PerLine.cxx            |   19 +-
 plugins/scintilla/scintilla/PerLine.h              |    4 +-
 plugins/scintilla/scintilla/PlatGTK.cxx            |  856 +++++++-----
 plugins/scintilla/scintilla/PositionCache.cxx      |   93 +-
 plugins/scintilla/scintilla/PositionCache.h        |   29 +-
 .../scintilla/{PropSet.cxx => PropSetSimple.cxx}   |   27 +-
 plugins/scintilla/scintilla/PropSetSimple.h        |    4 +-
 plugins/scintilla/scintilla/RESearch.cxx           |   98 +-
 plugins/scintilla/scintilla/RunStyles.cxx          |    4 +-
 plugins/scintilla/scintilla/SVector.h              |   14 +-
 plugins/scintilla/scintilla/ScintillaBase.cxx      |  301 +++--
 plugins/scintilla/scintilla/ScintillaBase.h        |   17 +-
 plugins/scintilla/scintilla/ScintillaGTK.cxx       | 1460 ++++++++++----------
 plugins/scintilla/scintilla/Selection.cxx          |   13 +-
 plugins/scintilla/scintilla/Selection.h            |    9 +-
 plugins/scintilla/scintilla/SparseState.h          |  110 ++
 plugins/scintilla/scintilla/SplitVector.h          |   29 +-
 plugins/scintilla/scintilla/Style.cxx              |  133 +-
 plugins/scintilla/scintilla/Style.h                |   64 +-
 plugins/scintilla/scintilla/StyleContext.cxx       |    9 +-
 plugins/scintilla/scintilla/StyleContext.h         |   51 +-
 plugins/scintilla/scintilla/UniConversion.cxx      |   16 +-
 plugins/scintilla/scintilla/UniConversion.h        |    3 +-
 plugins/scintilla/scintilla/ViewStyle.cxx          |  157 ++-
 plugins/scintilla/scintilla/ViewStyle.h            |   22 +
 plugins/scintilla/scintilla/WindowAccessor.cxx     |  191 ---
 plugins/scintilla/scintilla/WordList.cxx           |  205 +++
 plugins/scintilla/scintilla/WordList.h             |   41 +
 plugins/scintilla/scintilla/XPM.cxx                |    8 +-
 plugins/scintilla/scintilla/XPM.h                  |   12 +-
 plugins/scintilla/scintilla/include/HFacer.py      |    1 +
 plugins/scintilla/scintilla/include/ILexer.h       |   69 +
 plugins/scintilla/scintilla/include/Makefile.am    |    1 +
 plugins/scintilla/scintilla/include/Platform.h     |   20 +-
 plugins/scintilla/scintilla/include/SciLexer.h     |   91 ++-
 plugins/scintilla/scintilla/include/Scintilla.h    |   98 +-
 .../scintilla/scintilla/include/Scintilla.iface    |  223 +++-
 .../scintilla/scintilla/include/ScintillaWidget.h  |   10 +-
 plugins/scintilla/scintilla/lexers.make            |   15 +
 .../scintilla/patches/scintilla-64-bit.diff        |    8 +-
 .../scintilla/patches/scintilla-pango-always.diff  |   33 +-
 .../patches/scintilla-remove-deprecated.diff       |   86 +--
 plugins/scintilla/scintilla/test-scintilla.cxx     |   42 +-
 plugins/scintilla/style-editor.c                   |   20 +-
 plugins/scintilla/text_editor_cbs.c                |   15 +-
 180 files changed, 14299 insertions(+), 6089 deletions(-)
---
diff --cc configure.ac
index 1ab6372,ee0c128..245252a
--- a/configure.ac
+++ b/configure.ac
@@@ -60,18 -60,18 +60,6 @@@ AC_SUBST(GLIB_GENMARSHAL
  GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
  AC_SUBST(GLIB_MKENUMS)
  
--
--dnl ***************************************************************************
--dnl we need gconftool-2 in order to install the schema
--dnl ***************************************************************************
--AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
--
--if test "x$GCONFTOOL" = "xno"; then
--  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
--fi
--AM_GCONF_SOURCE_2
--
--
  dnl Compiler settings
  dnl ---------------------------------------------------------------------------
  
@@@ -209,15 -209,15 +197,6 @@@ if test "$libgraphviz_found" = yes; the
  	AC_DEFINE(HAVE_GRAPHVIZ, [], [Define if we have GraphViz >= 2.6.0])
  fi
  
--dnl we need gconftool-2 in order to install the schema
--AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
--
--if test "x$GCONFTOOL" = "xno"; then
--  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
--fi
--
--AM_GCONF_SOURCE_2
--
  dnl Scintilla Editor
  dnl -------------------------------------------------------------
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]