[glom] 1.13.4:

[Murray Cumming <murrayc src gnome org>]

commit 445cc71ac0806aa4bb536211ca0fd5a8d7abc37a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Feb 11 10:34:50 2010 +0100

    1.13.4:
    
    Rename boost::python m4 macro.
    
    * configure.ac:
    * macros/ax_boost_python.m4: Rename to ax_boost_python_macro.m4 and
    rename the defined m4 macro, to avoid confusion with the cleaner (but
    not working) original.

 ChangeLog                                          |   11 +++++++++++
 NEWS                                               |   10 ++++++++++
 configure.ac                                       |    4 ++--
 ..._boost_python.m4 => ax_boost_python_murrayc.m4} |    7 +++----
 4 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ec874d5..8e7a94f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1.13.4:
+
+2010-02-11  Murray Cumming  <murrayc murrayc com>
+
+	Rename boost::python m4 macro.
+
+	* configure.ac:
+	* macros/ax_boost_python.m4: Rename to ax_boost_python_macro.m4 and
+	rename the defined m4 macro, to avoid confusion with the cleaner (but
+	not working) original.
+
 2010-02-11  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build, due to file not added to git.
diff --git a/NEWS b/NEWS
index dd9c220..6fcdfff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+1.13.4 (unstable):
+
+* Glom now depends on boost::python.
+  This release is to give disto packagers a chance to cope with that.
+  (Murray Cumming)
+* Fix Maemo build errors
+  (Peter Penz)
+  (This fix is also in glom 1.2. The boost::python dependency will make 
+  building of 1.13/14 on Maemo almost impossible.
+
 1.13.3 (unstable):
 
 * Relationships Overview: Avoid a crash and a warning when closing.
diff --git a/configure.ac b/configure.ac
index 5237099..cff59cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.13.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.13.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])
@@ -206,7 +206,7 @@ AC_SUBST(PYTHON_CPPFLAGS)
 # Note that we have hacked this script to work with MM_CHECK_MODULE_PYTHON instead of AX_PYTHON
 # This does an AC_SUBST() of BOOST_PYTHON_LIBS
 # For the CFLAGS we must assume that boost is at the top-level, for instance in /usr/include/:
-AX_BOOST_PYTHON
+AX_BOOST_PYTHON_MURRAYC
 
 
 AC_ARG_ENABLE([update-mime-database],
diff --git a/macros/ax_boost_python.m4 b/macros/ax_boost_python_murrayc.m4
similarity index 97%
rename from macros/ax_boost_python.m4
rename to macros/ax_boost_python_murrayc.m4
index 4ef8f5f..5e36369 100644
--- a/macros/ax_boost_python.m4
+++ b/macros/ax_boost_python_murrayc.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_BOOST_PYTHON
+#   AX_BOOST_PYTHON_MURRAYC (based on AX_BOOST_PYTHON)
 #
 # DESCRIPTION
 #
@@ -55,7 +55,7 @@
 #With large changes by murrayc
 
 #Note that this previously said it was checking for the library, but it's techically the both the headers and library that it looks for. murrayc
-AC_DEFUN([AX_BOOST_PYTHON],
+AC_DEFUN([AX_BOOST_PYTHON_MURRAYC],
 [AC_REQUIRE([MM_CHECK_MODULE_PYTHON])dnl
 AC_CACHE_CHECK(whether the Boost::Python headers are available,
 ac_cv_boost_python,
@@ -68,7 +68,7 @@ ac_cv_boost_python,
  #fi
  if test x$PYTHON_CPPFLAGS != x; then
    #Note that this expects boost/ to be at some top-level such as /usr/include/
-   #We couldn't check for anything else anyway because there's no pkg-config file to tell us where it is 
+   #We couldn't check for anything else anyway because there's no pkg-config file to tell us where it is
    CPPFLAGS=$PYTHON_CPPFLAGS $CPPFLAGS
  fi
  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
@@ -118,4 +118,3 @@ if test "$ac_cv_boost_python" = "yes"; then
   AC_SUBST(BOOST_PYTHON_LIBS)
 fi
 ])dnl
-