[gtksourceviewmm/gtksourceviewmm-2.0] Revert wrong versions in configure and add config include.



commit 76edafe61b0a407f715dcb5092089168900b040c
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Nov 7 23:48:25 2010 +0100

    Revert wrong versions in configure and add config include.
    
    * configure.ac: By accident dependencies were incorrectly bumped.
    * gtksourceview/gtksourceviewmm.h:
    * gtksourceview/src/sourceiter.hg:
    * gtksourceview/src/sourceview.hg: Include gtksourceviewmmconfig.h,
    because GTKSOURCEVIEWMM_DISABLE_DEPRECATED macro is used in these
    files and it is defined in said config file.

 configure.ac                    |    6 +++---
 gtksourceview/gtksourceviewmm.h |    1 +
 gtksourceview/src/sourceiter.hg |    1 +
 gtksourceview/src/sourceview.hg |    1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 81a9b13..4953098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,9 +14,9 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.8])
-MM_INIT_MODULE([gtksourceviewmm-3.0])
+MM_INIT_MODULE([gtksourceviewmm-2.0])
 
-AC_SUBST([GTKSOURCEVIEWMM_SO_VERSION], [0:0:0])
+AC_SUBST([GTKSOURCEVIEWMM_SO_VERSION], [3:0:1])
 
 # AC_DISABLE_STATIC
 # AC_LIBTOOL_WIN32_DLL
@@ -24,7 +24,7 @@ AC_SUBST([GTKSOURCEVIEWMM_SO_VERSION], [0:0:0])
 LT_INIT([win32-dll disable-static])
 AC_PROG_CXX
 
-AC_SUBST([GTKSOURCEVIEWMM_MODULES], ['gtkmm-3.0 >= 2.90 gtksourceview-3.0 >= 2.9.7'])
+AC_SUBST([GTKSOURCEVIEWMM_MODULES], ['gtkmm-2.4 >= 2.12 gtksourceview-2.0 >= 2.9.7'])
 PKG_CHECK_MODULES([GTKSOURCEVIEWMM], [$GTKSOURCEVIEWMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
diff --git a/gtksourceview/gtksourceviewmm.h b/gtksourceview/gtksourceviewmm.h
index e0eeaec..00fff5f 100644
--- a/gtksourceview/gtksourceviewmm.h
+++ b/gtksourceview/gtksourceviewmm.h
@@ -71,6 +71,7 @@
  * of this project.
  */
 
+#include <gtksourceviewmmconfig.h>
 #include <gtksourceviewmm/init.h>
 #include <gtksourceviewmm/sourcebuffer.h>
 #include <gtksourceviewmm/sourcecompletion.h>
diff --git a/gtksourceview/src/sourceiter.hg b/gtksourceview/src/sourceiter.hg
index e45aa70..1db5ded 100644
--- a/gtksourceview/src/sourceiter.hg
+++ b/gtksourceview/src/sourceiter.hg
@@ -21,6 +21,7 @@
  */
 
 #include <gtkmm/textiter.h>
+#include <gtksourceviewmmconfig.h>
 _DEFS(gtksourceviewmm,gtksourceview)
 _CC_INCLUDE(gtksourceview/gtksourceiter.h)
 
diff --git a/gtksourceview/src/sourceview.hg b/gtksourceview/src/sourceview.hg
index f3e72e9..a9fdd74 100644
--- a/gtksourceview/src/sourceview.hg
+++ b/gtksourceview/src/sourceview.hg
@@ -24,6 +24,7 @@
 #include <gtksourceviewmm/sourcebuffer.h>
 #include <gtksourceviewmm/sourcegutter.h>
 #include <gtksourceviewmm/sourcecompletion.h>
+#include <gtksourceviewmmconfig.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/textview_p.h)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]