From 946d7a4f6cdefe9c2e073293cabe782e4ef85d4e Mon Sep 17 00:00:00 2001
From: "blizzard%appliedtheory.com"
 <blizzard%appliedtheory.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 1 Nov 1998 19:49:49 +0000
Subject: [PATCH] when using --enable-nglayout=gtk build gtk specific timer
 code

git-svn-id: svn://10.0.0.236/trunk@13845 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/base/src/Makefile.in     | 4 ++++
 mozilla/base/src/gtk/Makefile.in | 1 +
 mozilla/configure.in             | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/mozilla/base/src/Makefile.in b/mozilla/base/src/Makefile.in
index 82dfe76b38a..5beaa5acf27 100644
--- a/mozilla/base/src/Makefile.in
+++ b/mozilla/base/src/Makefile.in
@@ -27,8 +27,12 @@ DEFINES +=-D_IMPL_NS_BASE
 ifeq ($(OS_TARGET),Rhapsody)
 DIRS = rhapsody
 else
+ifeq ($(USE_NGLAYOUT_GTK),1)
+DIRS = gtk
+else
 DIRS = unix
 endif
+endif
 
 LIBRARY_NAME = raptorbase
 
diff --git a/mozilla/base/src/gtk/Makefile.in b/mozilla/base/src/gtk/Makefile.in
index 1cf3e86b420..a4a66c84655 100644
--- a/mozilla/base/src/gtk/Makefile.in
+++ b/mozilla/base/src/gtk/Makefile.in
@@ -34,3 +34,4 @@ CPPSRCS		= nsTimer.cpp
 
 include $(topsrcdir)/config/rules.mk
 
+CFLAGS		+= $(shell gtk-config --cflags)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 3484a13e17e..45f932455fe 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -896,6 +896,7 @@ base/Makefile
 base/public/Makefile
 base/src/Makefile
 base/src/unix/Makefile
+base/src/gtk/Makefile
 base/tests/Makefile
 caps/Makefile
 caps/public/Makefile
@@ -1086,6 +1087,7 @@ base/public/Makefile
 base/src/Makefile
 base/src/rhapsody/Makefile
 base/src/unix/Makefile
+base/src/gtk/Makefile
 base/tests/Makefile
 config/Makefile
 config/autoconf.mk