libbonobo r3440 - in trunk: . bonobo

[chpe svn gnome org]

Author: chpe
Date: Tue Jan 29 13:30:15 2008
New Revision: 3440
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3440&view=rev

Log:
2008-01-29  Christian Persch  <chpe gnome org>

	* bonobo/bonobo-exception.h:
	* bonobo/bonobo-object.h:
	* bonobo/bonobo-running-context.h:
	* configure.in:

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/autogen.sh
   trunk/bonobo/bonobo-exception.h
   trunk/bonobo/bonobo-object.h
   trunk/bonobo/bonobo-running-context.h
   trunk/configure.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jan 29 13:30:15 2008
@@ -1,3 +1,6 @@
+libbonobo 2.20.90
+        * Fix build with glib 2.15.4.
+
 libbonobo 2.20.4
 	* Fix build on Solaris (Brian Cameron)
 	* Fix potential situation hanging the entire desktop (Michael)

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Tue Jan 29 13:30:15 2008
@@ -14,4 +14,4 @@
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh

Modified: trunk/bonobo/bonobo-exception.h
==============================================================================
--- trunk/bonobo/bonobo-exception.h	(original)
+++ trunk/bonobo/bonobo-exception.h	Tue Jan 29 13:30:15 2008
@@ -56,7 +56,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,					\
 		#expr);							\
          return;                                                        \
      };	}G_STMT_END
@@ -71,7 +71,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,					\
 		#expr);							\
          return val;                                                    \
      };	}G_STMT_END

Modified: trunk/bonobo/bonobo-object.h
==============================================================================
--- trunk/bonobo/bonobo-object.h	(original)
+++ trunk/bonobo/bonobo-object.h	Tue Jan 29 13:30:15 2008
@@ -117,8 +117,8 @@
 							       gboolean                ref);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,TRUE);
-#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,FALSE);
+#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_STRFUNC,__LINE__,TRUE);
+#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_STRFUNC,__LINE__,FALSE);
 #endif	/* BONOBO_OBJECT_DEBUG */
 void                     bonobo_object_dump_interfaces        (BonoboObject *object);
 

Modified: trunk/bonobo/bonobo-running-context.h
==============================================================================
--- trunk/bonobo/bonobo-running-context.h	(original)
+++ trunk/bonobo/bonobo-running-context.h	Tue Jan 29 13:30:15 2008
@@ -49,9 +49,9 @@
 void        bonobo_running_context_at_exit_unref     (CORBA_Object object);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,0);}G_STMT_END
-#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,1);}G_STMT_END
-#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,2);}G_STMT_END
+#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,0);}G_STMT_END
+#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,1);}G_STMT_END
+#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,2);}G_STMT_END
 #endif
 
 G_END_DECLS

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 29 13:30:15 2008
@@ -1,6 +1,8 @@
+AC_PREREQ([2.59])
+
 m4_define([bonobo_major_version],[2])
-m4_define([bonobo_minor_version],[20])
-m4_define([bonobo_micro_version],[5])
+m4_define([bonobo_minor_version],[21])
+m4_define([bonobo_micro_version],[90])
 m4_define([bonobo_version],[bonobo_major_version.bonobo_minor_version.bonobo_micro_version])
 
 AC_INIT([libbonobo],[bonobo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo])
@@ -134,7 +136,7 @@
 # checks for working GThread
 # Aware: "make check" fails with --disable-threads
 AC_ARG_ENABLE(threads,
-	      AC_HELP_STRING([--disable-threads],
+	      AS_HELP_STRING([--disable-threads],
 			     [Disable multithread support @<:@default=enabled@:>@]),
 	      enable_threads="$enableval", enable_threads=yes)
 
@@ -176,7 +178,7 @@
 GTK_DOC_CHECK([1.0])
 
 AC_ARG_ENABLE(debug,
-	      AC_HELP_STRING([--enable-debug],
+	      AS_HELP_STRING([--enable-debug],
 			     [Enable debugging code @<:@default=disabled@:>@]),
 	      enable_debug="$enableval", enable_debug=no)
 
@@ -185,7 +187,7 @@
 fi
 
 AC_ARG_ENABLE(bonobo-activation-debug,
-	      AC_HELP_STRING([--enable-bonobo-activation-debug],
+	      AS_HELP_STRING([--enable-bonobo-activation-debug],
 			     [turn on debugging @<:@default=no@:>@]),
 	      enable_bonobo_activation_debug=$enableval, enable_bonobo_activation_debug=no)