diff -Naur Guppi-0.40.3.old/configure Guppi-0.40.3/configure --- Guppi-0.40.3.old/configure Tue Jan 22 13:15:34 2002 +++ Guppi-0.40.3/configure Wed Jul 10 22:21:50 2002 @@ -4784,11 +4786,11 @@ ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-undefined dynamic_lookup' # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes diff -Naur Guppi-0.40.3.old/ltmain.sh Guppi-0.40.3/ltmain.sh --- Guppi-0.40.3.old/ltmain.sh Tue Jan 22 13:15:19 2002 +++ Guppi-0.40.3/ltmain.sh Wed Jul 10 22:16:10 2002 @@ -2889,8 +2889,14 @@ # Do each of the archive commands. if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + +eval cmds=\"$archive_expsym_cmds\" else + if test "x$verstring" = "x0.0"; then + tmp_verstring= + else + tmp_verstring="$verstring" + fi eval cmds=\"$archive_cmds\" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' diff -Naur Guppi-0.40.3.old/src/libguppispecfns/const.c Guppi-0.40.3/src/libguppispecfns/const.c --- Guppi-0.40.3.old/src/libguppispecfns/const.c Sun May 6 03:16:23 2001 +++ Guppi-0.40.3/src/libguppispecfns/const.c Wed Jul 10 22:17:10 2002 @@ -62,6 +62,10 @@ #include "mconf.h" #include +#ifdef INFINITY +#undef INFINITY +#endif + #ifdef UNK #if 1 double MACHEP = 1.11022302462515654042E-16; /* 2**-53 */ --- Guppi-0.40.3/src/libguppiuseful/guppi-plug-in.c.foo 2005-03-07 16:46:56.000000000 -0500 +++ Guppi-0.40.3/src/libguppiuseful/guppi-plug-in.c 2005-03-07 16:52:32.000000000 -0500 @@ -47,7 +47,7 @@ guppi_finalized (obj); - guppi_free0 ((gpointer)pi->load_path); + guppi_free0 (pi->load_path); if (parent_class->finalize) parent_class->finalize (obj); --- Guppi-0.40.3/src/libguppispecfns/mtherr.c.foo 2005-03-07 17:05:14.000000000 -0500 +++ Guppi-0.40.3/src/libguppispecfns/mtherr.c 2005-03-07 17:05:22.000000000 -0500 @@ -58,7 +58,7 @@ #include #include "mconf.h" -static int merror = 0; +int merror = 0; /* Notice: the order of appearance of the following * messages is bound to the error codes defined --- Guppi-0.40.3/src/libguppidata/guppi-data.c.foo 2005-03-07 17:08:27.000000000 -0500 +++ Guppi-0.40.3/src/libguppidata/guppi-data.c 2005-03-07 17:19:11.000000000 -0500 @@ -1079,8 +1079,6 @@ static void guppi_data_class_init (GuppiDataClass *klass) { - static void build_menu (GuppiData *, GtkMenu *, gpointer); - GtkObjectClass *object_class = (GtkObjectClass *) klass; parent_class = gtk_type_class (GTK_TYPE_OBJECT); --- Guppi-0.40.3/src/libguppidata/guppi-seq-scalar.c.foo 2005-03-07 17:08:49.000000000 -0500 +++ Guppi-0.40.3/src/libguppidata/guppi-seq-scalar.c 2005-03-07 17:19:35.000000000 -0500 @@ -1775,8 +1775,6 @@ static void guppi_seq_scalar_class_init (GuppiSeqScalarClass *klass) { - static GtkWidget *info_display (GuppiData *); - GtkObjectClass *object_class = (GtkObjectClass *) klass; GuppiDataClass *data_class = GUPPI_DATA_CLASS (klass); GuppiSeqClass *seq_class = GUPPI_SEQ_CLASS (klass); --- Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c.foo 2005-03-07 17:15:25.000000000 -0500 +++ Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c 2005-03-07 17:16:21.000000000 -0500 @@ -153,10 +153,11 @@ guppi_canvas_item_set_bbox_c (item, 0, 0, xsize, ysize); } +static void canv_size_allocate (GtkWidget *, GtkAllocation *, gpointer); + static void changed_scale (GuppiCanvasItem *item, double scale) { - static void canv_size_allocate (GtkWidget *, GtkAllocation *, gpointer); GuppiRootGroupItem *root_item = GUPPI_ROOT_GROUP_ITEM (item); if (GUPPI_CANVAS_ITEM_CLASS (parent_class)->changed_scale) --- Guppi-0.40.3/src/libguppiplot/guppi-axis-markers.c.foo 2005-03-07 17:16:35.000000000 -0500 +++ Guppi-0.40.3/src/libguppiplot/guppi-axis-markers.c 2005-03-07 17:17:12.000000000 -0500 @@ -47,10 +47,11 @@ static guint gam_signals[LAST_SIGNAL] = { 0 }; +static void clear (GuppiAxisMarkers *); + static void guppi_axis_markers_finalize (GtkObject * obj) { - static void clear (GuppiAxisMarkers *); GuppiAxisMarkers *gal = GUPPI_AXIS_MARKERS (obj); guppi_finalized (obj); diff -urN ../tmp-orig/guppi-0.40.3/libguppitank/guppi-object-barchart.c ./libguppitank/guppi-object-barchart.c --- ../tmp-orig/guppi-0.40.3/libguppitank/guppi-object-barchart.c 2002-01-08 07:28:53.000000000 +0100 +++ ./libguppitank/guppi-object-barchart.c 2004-07-18 23:26:34.288620561 +0200 @@ -700,7 +700,6 @@ obar->bar_callback3 (r, c, obar->bar_callback3_data); break; - default: } } @@ -732,7 +731,6 @@ obar->legend_callback3_data); break; - default: } } diff -urN ../tmp-orig/guppi-0.40.3/src/demo.c ./src/demo.c --- ../tmp-orig/guppi-0.40.3/src/demo.c 2002-01-08 07:28:57.000000000 +0100 +++ ./src/demo.c 2004-07-18 23:22:03.279195869 +0200 @@ -450,7 +450,6 @@ case GUPPI_EAST: compass_pos = GUPPI_NORTH; break; - default: } guppi_element_state_set (state, diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c ./src/libguppiplot/guppi-layout-constraint.c --- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c 2002-01-19 03:45:21.000000000 +0100 +++ ./src/libguppiplot/guppi-layout-constraint.c 2004-07-18 23:18:57.890164355 +0200 @@ -163,8 +163,6 @@ guppi_layout_constraint_add_term (glc, GLC_REGION_BOTTOM, -factor, geom); return; - default: - /* Fall through, do nothing. */ } ti = term_info_new (type, factor, geom); diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c ./src/libguppiplot/guppi-root-group-item.c --- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c 2002-01-08 07:31:08.000000000 +0100 +++ ./src/libguppiplot/guppi-root-group-item.c 2004-07-18 23:20:25.093245278 +0200 @@ -547,7 +547,6 @@ case GDK_MOTION_NOTIFY: return motion_notify_event (root, &(ev->motion)); - default: } return FALSE; @@ -776,7 +775,7 @@ case ROOT_GROUP_RESIZE_NONE: default: - /* insure we do nothing */ + break; /* insure we do nothing */ } if (please_resize_canvas) diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-text-block.c ./src/libguppiplot/guppi-text-block.c --- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-text-block.c 2001-11-26 21:00:17.000000000 +0100 +++ ./src/libguppiplot/guppi-text-block.c 2004-07-18 23:18:30.243528431 +0200 @@ -898,8 +898,6 @@ nothing. */ break; - default: - /* Do nothing. */ } render_stack_evolve (stack, tt); diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-view-interval.c ./src/libguppiplot/guppi-view-interval.c --- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-view-interval.c 2002-01-19 03:45:21.000000000 +0100 +++ ./src/libguppiplot/guppi-view-interval.c 2004-07-18 23:18:02.052998083 +0200 @@ -226,7 +226,6 @@ return x != 0; #endif - default: } return TRUE;