libbonobo r3435 - in trunk: . bonobo-activation po

[kmaraas svn gnome org]

Author: kmaraas
Date: Fri Jan 25 14:26:42 2008
New Revision: 3435
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3435&view=rev

Log:
2008-01-25  Kjartan Maraas  <kmaraas gnome org>

	* DEPENDS: Fix some.
	* NEWS: Update
	* bonobo-activation/bonobo-activation-init.c: Mark som stuff static
	* configure.in: Remove obsolete check for unneeded parts of popt.
	<dmacks at netspace org>

Modified:
   trunk/ChangeLog
   trunk/DEPENDS
   trunk/NEWS
   trunk/bonobo-activation/bonobo-activation-init.c
   trunk/configure.in
   trunk/po/ChangeLog

Modified: trunk/DEPENDS
==============================================================================
--- trunk/DEPENDS	(original)
+++ trunk/DEPENDS	Fri Jan 25 14:26:42 2008
@@ -1,2 +1 @@
 ORBit
-libefs

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Jan 25 14:26:42 2008
@@ -1,3 +1,6 @@
+libbonobo 2.20.4
+	* Fix build on Solaris (Brian Cameron)
+
 libbonobo 2.20.3
 	* Fix some gcc'isms causing problems with glib 2.15.0
 	* fix C99ism

Modified: trunk/bonobo-activation/bonobo-activation-init.c
==============================================================================
--- trunk/bonobo-activation/bonobo-activation-init.c	(original)
+++ trunk/bonobo-activation/bonobo-activation-init.c	Fri Jan 25 14:26:42 2008
@@ -693,7 +693,8 @@
         return retval;
 }
 
-const char  bonobo_activation_version []    = VERSION;
-const guint bonobo_activation_major_version = BONOBO_ACTIVATION_MAJOR_VERSION;
-const guint bonobo_activation_minor_version = BONOBO_ACTIVATION_MINOR_VERSION;
-const guint bonobo_activation_micro_version = BONOBO_ACTIVATION_MICRO_VERSION;
+static const char  bonobo_activation_version []    = VERSION;
+static const guint bonobo_activation_major_version = BONOBO_ACTIVATION_MAJOR_VERSION;
+static const guint bonobo_activation_minor_version = BONOBO_ACTIVATION_MINOR_VERSION;
+static const guint bonobo_activation_micro_version = BONOBO_ACTIVATION_MICRO_VERSION;
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan 25 14:26:42 2008
@@ -127,9 +127,6 @@
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)
 
-# popt
-AC_CHECK_LIB(popt, poptStrippedArgv, POPT_LIBS=-lpopt, AC_MSG_ERROR([You must have popt version 1.5 or greater installed.]))
-AC_SUBST(POPT_LIBS)
 AC_CHECK_HEADER(popt.h,,AC_MSG_ERROR([Failed to find popt.h - you may have to adjust your environment]))
 
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_VERSION)