[GnomeMeeting-devel-list] Building gnomemeeting

[PUYDT Julien <jpuydt free fr>]

Hi,

following the ongoing (private) discussion on which compiler to choose
for the win32 port, I'm (re)reading how gnomemeeting is built.

I have seen that some things are passed as arguments by gcc, and others
are obtained through the use of a toplevel config.h (there's a nice name
clash with src/config.h). Do we really need to keep both?

Notice that there is a good reason why some things go through the
command line: for example G_LOG_DOMAIN is used in glib/gmessages.h,
which obviously won't #include "$(toplevel)/config.h".

Would it be possible to get rid of the toplevel config.h entirely?

Snark

PS: the little patch makes some things shared -- using the toplevel
config.h!

diff -urN gnomemeeting/configure.in gnomemeeting.patched/configure.in
--- gnomemeeting/configure.in	2004-11-15 22:09:03 +0100
+++ gnomemeeting.patched/configure.in	2004-11-19 12:47:56 +0100
@@ -21,6 +21,7 @@
 AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION,[fix])
 AC_DEFINE_UNQUOTED(BUILD_TYPE, $BUILD_TYPE,[fix])
 AC_DEFINE_UNQUOTED(BUILD_NUMBER, $BUILD_NUMBER,[fix])
+AC_DEFINE_UNQUOTED(VERSION_NUMBER, 1000 * $MAJOR_VERSION + 10 * $MINOR_VERSION + $BUILD_NUMBER, [fix])
 
 
 dnl ###########################################################################
diff -urN gnomemeeting/src/druid.cpp gnomemeeting.patched/src/druid.cpp
--- gnomemeeting/src/druid.cpp	2004-11-03 13:00:14 +0100
+++ gnomemeeting.patched/src/druid.cpp	2004-11-19 12:48:48 +0100
@@ -1342,7 +1342,6 @@
   
   GtkWidget *active_item = NULL;
   int item_index = 0;
-  int version = 0;
 
   BOOL has_video_device = FALSE;
   
@@ -1488,9 +1487,7 @@
   
 
   /* Update the version number */
-  version = MAJOR_VERSION*1000+MINOR_VERSION*10+BUILD_NUMBER;
-    
-  gm_conf_set_int (GENERAL_KEY "version", version);
+  gm_conf_set_int (GENERAL_KEY "version", VERSION_NUMBER);
 }
 
 
diff -urN gnomemeeting/src/gnomemeeting.cpp gnomemeeting.patched/src/gnomemeeting.cpp
--- gnomemeeting/src/gnomemeeting.cpp	2004-11-05 07:17:00 +0100
+++ gnomemeeting.patched/src/gnomemeeting.cpp	2004-11-19 12:48:21 +0100
@@ -445,8 +445,7 @@
 
 
 #ifndef DISABLE_GNOME
- if (gm_conf_get_int (GENERAL_KEY "version") 
-      < 1000 * MAJOR_VERSION + 10 * MINOR_VERSION + BUILD_NUMBER) {
+  if (gm_conf_get_int (GENERAL_KEY "version") < VERSION_NUMBER) {
 
    gtk_widget_show_all (GTK_WIDGET (druid_window));
   }
@@ -479,8 +478,7 @@
 			    _("Started GnomeMeeting %d.%d.%d for user %s"), 
 			    MAJOR_VERSION, MINOR_VERSION, BUILD_NUMBER,
 			    g_get_user_name ());
-  PTRACE (1, "GnomeMeeting version " 
-	  << MAJOR_VERSION << "." << MINOR_VERSION << "." << BUILD_NUMBER);
+  PTRACE (1, "GnomeMeeting version " << VERSION);
   PTRACE (1, "OpenH323 version " << OPENH323_VERSION);
   PTRACE (1, "PWLIB version " << PWLIB_VERSION);
 #ifndef DISABLE_GNOME