made "->" into a "." of previous change so it compiles

* gdk/gdkevents.c: made "->" into a "." of previous change so
it compiles

* gtk/gtkfontsel.c: added braces enclosing an if-else construct

* autogen.sh: add --enable-maintainer-mode

* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

-Yosh

12 files changed, 98 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5af9c35f3..7d0b30f4c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Thu Apr  1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkevents.c: made "->" into a "." of previous change so
+	it compiles
+
+	* gtk/gtkfontsel.c: added braces enclosing an if-else construct
+
+	* autogen.sh: add --enable-maintainer-mode
+
+	* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 Thu Apr  1 18:41:25 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkevents.c (gdk_compress_exposures): Set the
diff --git a/autogen.sh b/autogen.sh
index fa0fabfa2..6fe026c86 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -80,7 +80,7 @@ automake -a $am_opt
 autoconf
 cd $ORIGDIR
 
-$srcdir/configure "$@"
+$srcdir/configure --enable-maintainer-mode "$@"
 
 echo 
 echo "Now type 'make' to compile $PROJECT."
diff --git a/configure.in b/configure.in
index b66ca7ce4..5f20d6202 100644
--- a/configure.in
+++ b/configure.in
@@ -143,6 +143,9 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
 
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index d3821aec4..27c492853 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -450,7 +450,7 @@ gdk_compress_exposures (XEvent    *xevent,
 		  expose_predicate, 
 		  (XPointer)&info);
 
-      event->any.window = window;
+      event.any.window = window;
       
       /* We apply filters here, and if it was filtered, completely
        * ignore the return
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index d3821aec4..27c492853 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -450,7 +450,7 @@ gdk_compress_exposures (XEvent    *xevent,
 		  expose_predicate, 
 		  (XPointer)&info);
 
-      event->any.window = window;
+      event.any.window = window;
       
       /* We apply filters here, and if it was filtered, completely
        * ignore the return
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 060d56ed2..1a391f65b 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1440,19 +1440,21 @@ gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel)
       can_match = TRUE;
 
       if (nbitmapped_sizes)
-	if (fontsel->metric == GTK_FONT_METRIC_POINTS)
-	  {
-	    if (*bitmapped_sizes % 10 != 0)
-	      can_match = FALSE;
-	    bitmap_size = *bitmapped_sizes / 10;
-	    bitmap_size_float = *bitmapped_sizes / 10;
-	  }
-	else
-	  {
-	    bitmap_size = *bitmapped_sizes;
-	    bitmap_size_float = *bitmapped_sizes;
-	  }
-      
+	{
+	  if (fontsel->metric == GTK_FONT_METRIC_POINTS)
+	    {
+	      if (*bitmapped_sizes % 10 != 0)
+		can_match = FALSE;
+	      bitmap_size = *bitmapped_sizes / 10;
+	      bitmap_size_float = *bitmapped_sizes / 10;
+	    }
+	  else
+	    {
+	      bitmap_size = *bitmapped_sizes;
+	      bitmap_size_float = *bitmapped_sizes;
+	    }
+	}
+
       if (can_match && nstandard_sizes && nbitmapped_sizes
 	  && *standard_sizes == bitmap_size)
 	{